Merge "CarrierConfigLoader shouldn't use unsupported APIs"