[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: f4f0379448 -s ours am: 2effa2871a -s ours

am skip reason: Merged-In I732861692946d1aa6bef2c6798f00c98d52ed6d6 with SHA-1 32037dc333 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/5.10/x86-64/+/20953384

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