Merge "Merge branch tm-release" into tm-gsi-dev am: e51848377e

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

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