Merge changes from topic "tc_change_23050307_32" into udc-dev am: b3764697...

Merge changes from topic "tc_change_23050307_32" into udc-dev am: b3764697 am: db6f757e am: 1c864c0c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/22973559



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