[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 41693aaf89 -s ours am: 69bf89b0b9 -s ours

am skip reason: Merged-In I584b74ebbc22c10f8a5358f123aa72870a0afaed with SHA-1 5cbb5247da is already in history

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

Change-Id: Ic759b8e22bb1f04539378c47ae5396cf4062bb4d