Merge changes from topic "tc_change_23042206_52" into udc-dev am: 245c9d61d1 am: 92afb1203f am: 6548a10cb0

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

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