[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: 23f48e28 -s ours am: 086f4050 -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: I059615c0502b3f2ea4aed7b683bd456eddc61664