[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136"...

[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master am: ff4f68ec -s ours

am skip reason: Merged-In Icf64b668a11a1d7cb7b7c28b4937695ab8997929 with SHA-1 9883f7eb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/20956703



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