Merge "Correct Typo in CarrierConfigManager introduced in b/197992603"