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: I603705042e23a0897b321e3a2105d2d4900d774a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>