[automerger skipped] Merge "Merge Android 12" am: c9f4ae08f1 -s ours am: 2fbfd23067 -s ours am: f0d922687a -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: I2c6a0a6910098a3e838c7b31ab6b3b6dd8c8c59c