[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 070cb2809e -s ours am: 1aecba64d9 -s ours

am skip reason: Merged-In If63bf6baf07c529d933549d535a854c21d664c9d with SHA-1 a66c71c056 is already in history

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

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