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

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

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