[automerger skipped] Merge "Merge Android 12L" am: e09af8e595 -s ours am: a4ce5ddded -s ours

am skip reason: Merged-In I5c6b7898864fe125c9a274be800ad237d6e42738 with SHA-1 96eee697d6 is already in history

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

Change-Id: I333909023f49f2985351adf7c08290ce244607c0