Merge "Sync with carrier config naming changing" into udc-dev am: fbf18654

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



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