Merge "Correct default to match CarrierConfigManager"