Merge changes from topic "am-a3cf713153df49459fb772566453755a" into udc-d1-dev-plus-aosp am: 287515c349 am: 7266b04938

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

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