Merge "Update correct typo in CarrierConfigManager"