Merge "Revert "Add CarrierConfig to hide "Network default" option in Caller ID setting""