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

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

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