Merge changes from topic "tc_change_23042206_52" into udc-dev am: 245c9d61d1 am: 5b985f2153 am: 460ee0fb92

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

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