[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 025a113825 -s ours am: 1eecc4db48 -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/+/19094733

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