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

Merge changes from topic "tc_change_23050307_59" into udc-dev-plus-aosp am: 5530ee40 am: 990d31ac

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



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