[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am:...

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 64557aef -s ours am: ad8ed786 -s ours am: b8883b66 -s ours

am skip reason: Merged-In Ie9afb725313954285f1ff86281d7e923e57b355c with SHA-1 e1a80d2e is already in history

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

Change-Id: I49daf7fbc510c57024c4784ccab608189d36d0ca