Revert incorrect TM Branching Stage 4 merges am: 8e8388020b am: 41bff2a8a5 am: 31fc431189

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

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