Merge "[automerger skipped] Merge Android 13 QPR1 am: 64024860a2 -s ours" into stage-aosp-master am: 59ab0fffed -s ours am: 46db895e5e -s ours

am skip reason: Merged-In I1b97db517238883c78c887dde593d6335ae65ae4 with SHA-1 b8baac529b is already in history

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

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