[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ebe1a3f000 -s ours am: 4acdd372c6 -s ours

am skip reason: Merged-In I6d9f142e46ba25dc4e19883b593a0f7349a61ecf with SHA-1 2a35a5817a is already in history

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

Change-Id: I6997c3db374361ea64f0615033bb5b2556d59a3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>