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

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

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



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