Merge "Remove @hide for CarrierConfigManager constant"