[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: 56b6f24e -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: I11d32de9a5aaeeef877ffae6aaad35b16e78ad43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>