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

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



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