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

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



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