Merge changes from topic "tc_change_2305100725_45" into udc-dev-plus-aosp am:...

Merge changes from topic "tc_change_2305100725_45" into udc-dev-plus-aosp am: 1bd593cb am: 5096bfeb

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



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