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: I31bedfe67066207d4be40f5d71f98fd62cefae2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>