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

Change-Id: I73c5f3388ebf83c2f35ec2a29b309fbb04a0866e