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

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

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