Merge branch tm-qpr1-release am: a31ae95cbc

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

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