[automerger skipped] Merge "Carrier config, log, and typo cleanup" into main...

[automerger skipped] Merge "Carrier config, log, and typo cleanup" into main am: adbdb38f am: c182d36d -s ours am: 381b2df1 -s ours am: 7ab59308 -s ours am: b74895fa -s ours

am skip reason: Merged-In Ib1be6804ef6f38c603414c5aa03ad52bcb3691cd with SHA-1 1d2c0802 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2482503



Change-Id: Ia4a1299277880704501552f29a4fc543e53edb08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>