Revert incorrect TM Branching Stage 4 merges am: 8e8388020b

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

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