Merge "Revert "Add CarrierConfig to hide "Network default" option in Caller ID setting""
am: 94fe6430ea

Change-Id: Ic9087bd5f12bdcf184d49b9590bd601da7bfb0ea