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

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



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