[automerger skipped] Merge Android 12 am: b53e87e98d -s ours am: 061b1d8cf3 -s ours am: d5cf738427 -s ours am: a9db1a522f -s ours

am skip reason: Merged-In I2ac7806f0bb0d27264b2b7265fae95e9d4ee8f75 with SHA-1 41693aaf89 is already in history

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

Change-Id: I75b292baaa0f39b393c5442aa5081d03ddf5a1fc