[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 830ecd9086 -s ours am: fa0ac82e24 -s ours

am skip reason: Merged-In I8ae63a8cc393722ec13125364ab2bde35f46dbe6 with SHA-1 06236109f0 is already in history

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

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