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

am skip reason: Merged-In I9524cbd2193861cc5e8ce0771accf984b0f0d0d8 with SHA-1 db264cde13 is already in history

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

Change-Id: I1100d2e0c227713805d2ea78f2e59309bbe8f609