Revert incorrect TM Branching Stage 4 merges am: 8e8388020b am: 41bff2a8a5 am: 2c869c9dfd am: 158c3f6b89

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

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