[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: b96d14c040 -s ours

am skip reason: Change-Id I5f04c18ba85786a4e511a90bb6f2e4fc55a52076 with SHA-1 8cc7220b64 is in history

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

Change-Id: Ib755c083136174aa1257aa48b5dc5895fd64ca64