[automerger skipped] Merge Android 13 QPR1 am: 23d04c6a92 -s ours am: b806fa16ce -s ours am: 2d1b91770a -s ours

am skip reason: Merged-In I878f3782fef77c2549842d77a7da9471643abdb6 with SHA-1 d83a4bd34d is already in history

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

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