Revert incorrect TM Branching Stage 4 merges am: 98a74d03cf am: 30769e7112 am: a219eeda37

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

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