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

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



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