Merge changes from topic "tc_change_2305100725_26" into udc-dev am: 080e94be...

Merge changes from topic "tc_change_2305100725_26" into udc-dev am: 080e94be am: 3743c40f am: 73df97d1 am: 5064e773

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



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