[automerger skipped] Merge Android 12 am: 6dc7e45b05 -s ours am: 801ed30a31 -s ours am: 27618739c1 -s ours am: 96344780c2 -s ours am: 096cfe8afe -s ours

am skip reason: Merged-In I99298dfa8fc439e6f7f016cadeb7841be0f25665 with SHA-1 f20c13531e is already in history

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/5.4/x86-64/+/1847694

Change-Id: I3adff55b71785260b7ea4121676edc8c93f76113