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

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

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