Merge branch tm-qpr1-release am: a9324464f0 am: 7d61fa91de

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

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