Revert incorrect TM Branching Stage 4 merges am: 8e8388020b am: 47b9782a57 am: 9ede010646 am: aeefd95033

Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/5.4/x86-64/+/17920427

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