Merge "Carrier config, log, and typo cleanup" into main am: adbdb38f

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



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