Revert incorrect TM Branching Stage 4 merges am: 98a74d03cf am: 78a2d13c0c

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

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