[automerger skipped] Merge Android 12 am: 26d999fc60 -s ours

am skip reason: Merged-In Ibbc220dfaf24fe5868af6396b9c7e0783421dacd with SHA-1 831a55e093 is already in history

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/1847165

Change-Id: I9a3cae0877ac59b401f8086163e903c5a2b1bea3