Merge branch tm-qpr1-release am: a31ae95cbc am: e63459b836

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

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