[automerger skipped] Merge "Merge Android 12" am: 7c376deb24 -s ours am: a9ba8deb4e -s ours

am skip reason: Merged-In I8ddbe0c5ee40d4b4cd6190f63cf9339a1d914f2c with SHA-1 44af597715 is already in history

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

Change-Id: Ie083fc22e31a2465a42c2b051f5c94493c47a1ec