[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 1ff81a68a9 -s ours am: a2bd9557f5 -s ours

am skip reason: Merged-In I0fb800840ef9b3faa216b0d55946ad0bbc9fdd2b with SHA-1 933dcd9fac is already in history

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

Change-Id: I68c251b4cb77ec52fb50617e403993795d1160b7