[automerger skipped] Merge "Correct Typo in CarrierConfigManager introduced in...

[automerger skipped] Merge "Correct Typo in CarrierConfigManager introduced in b/197992603" am: 88f40939 am: 608c0d8e am: dbc2717b am: 98083abc -s ours

am skip reason: Merged-In Ia2db386e7394fd09194477e529fc6e8c752623c2 with SHA-1 5f886ed4 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978094

Change-Id: Ieaef1412bd1548163f021a6c69c2b38cce0dfd01