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

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



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