Merge changes from topic "carrier-service-override-udc-dev" into udc-dev am: 1230bdf6

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



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