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

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



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