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

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

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



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