Revert incorrect TM Branching Stage 4 merges am: 98a74d03cf am: 78a2d13c0c am: 2212b64efe am: 8694bf76a8

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

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