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: I84fe47c8500cea26f9e84d37b8a5ae6e9fecc8c1
Signed-off-by: Automerger Merge Worker <[email protected]>