Merge "Soft Remove CarrierConfigManager.KEY_HIDE_ENABLE_2G" into main