Merge changes from topic "tc_change_23042206_52" into udc-dev am: 5fc9785c

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



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