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: 23bd5389 am: 10b6e062

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



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