[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 1ff81a68a9 -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: I64a71b37033ac9e0da01a54fd5a44463b7ce00d4