Merge changes from topic "tc_change_23050307_32" into udc-dev am: b3764697...

Merge changes from topic "tc_change_23050307_32" into udc-dev am: b3764697 am: c45710e6 am: 8698ee4d

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



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