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