[automerger skipped] Merge "Merge Android 12" am: c9f4ae08f1 -s ours am: 2fbfd23067 -s ours

am skip reason: Merged-In I6f522d6d244351a294cfa10defa2744cf5f16564 with SHA-1 937ffae447 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1847664

Change-Id: Ibb3311763aa4a556269edbf3f4b7411ef9d7fb4b