Revert incorrect TM Branching Stage 4 merges am: cb3f6044c1 am: f112f77041 am: 4be15bb0a4 am: ed0ee3d2a2

Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/x86-64/+/17919929

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