[automerger skipped] Merge Android 12L am: 7789ed58ef -s ours am: 4324eb70d5 -s ours am: 5c445f63a6 -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: I83d0516dc5a1ea13db99e7d5214c06672df17091