[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 8aa8593c3e -s ours

am skip reason: Merged-In I8f2d9bbe7aa60679dc225d50b7adf1457bba4e7b with SHA-1 71a41ba196 is already in history

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

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