[automerger skipped] Merge "Update correct typo in CarrierConfigManager" am: a73ac0c432 am: 67d0ae9300 am: ee37922ae1 am: 66e2713830 -s ours

am skip reason: Merged-In I05b4ebfeaed569b423db1abf033b08db471e6ae3 with SHA-1 f45e45b0d3 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1976889

Change-Id: If44ea219b652ef65baaffef1a2a9c504cb2fca58