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

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

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