[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 64557aefcc -s ours am: ad8ed7863f -s ours

am skip reason: Merged-In Ie9afb725313954285f1ff86281d7e923e57b355c with SHA-1 e1a80d2e75 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: Iafdf9cf43f7b5ac54210ea00306ff093931951fa