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

Change-Id: Ib1df1851a44d64db8ed1b804d19c6e0a664907dd