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: debc0d31 am: dd5768b0

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



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