[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "carrier-service-override-udc-dev" into udc-dev am: 1230bdf6 am: c03a632d -s ours

am skip reason: Merged-In Idcaaff8c9c3ed67b93bc23237de841219a5be7d7 with SHA-1 7d9c790f is already in history

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



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