[automerger skipped] Merge "Merge...

[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 6b46a1bc -s ours

am skip reason: Merged-In I4948f7c234cd4f2b65d9c591dba2c99617b1bac4 with SHA-1 e20f41b7 is already in history

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

Change-Id: Iedb1c568404c75dfab52ad30a94aeade16b4edeb