[automerger skipped] Merge "Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: 25d06312ff -s ours am: 0e7d5b47f5 -s ours

am skip reason: Merged-In I51db8f0b3abe444fa69493ad4a0b730e41f59fb9 with SHA-1 b697813559 is already in history

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

Change-Id: I8914df2f006a664cbb70acde2c55acec5c5d88a3