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

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



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