Merge changes from topic "am-1a639eaa84504a15988bb274c4f563e8" into tm-qpr-dev-plus-aosp am: 81580c56a2

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

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