Merge "Revert "Add CarrierConfig to hide "Network default" option in Caller ID setting"" am: 55780ebe0f
am: 737d4c25d6

Change-Id: I89648f5a283c007d7cc49ad8555ccdcb43c0a977