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

am skip reason: Merged-In I0f22bb6e4c1f1d48375844861881ad139d6646aa with SHA-1 619bb99665 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/16279074

Change-Id: I7c4acec245c520a36f262e42790d7a91b70d8fb9