Android U Beta 1 GPL
Revert incorrect TM Branching Stage 4 merges am: 98a74d03cf am: 78a2d13c0c am: e8ad5a9f08

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

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