[automerger skipped] Merge Android 12 am: 26d999fc60 -s ours am: a2af18e0c6 -s ours am: 039afd2d16 -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: Iecd49f83ad1c6bb8c0ec61aac7984b550cb46064