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: c346681b am: d2728932

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



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