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: 19a06355 am: bbe20af9 am: 6a269242

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



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