[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 79d7c1171e -s ours am: 0aa0ea9252 -s ours

am skip reason: Merged-In Ie6749dcf2adfe81d73d5553297a1a4244f9a1e9a with SHA-1 be77c320a6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/5.10/arm64/+/20136947

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