[automerger skipped] Merge Android 12 am: ff91a34375 -s ours am: ee3e4509ac -s ours

am skip reason: Merged-In I304299133d16934b75e9c7d11cacc15ea20b8ea6 with SHA-1 64557aefcc is already in history

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1847713

Change-Id: If8f5cc28bef1eaa8a9483426fe8a6ab4d2f8a749