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

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

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