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

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

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