Revert incorrect TM Branching Stage 4 merges am: cb3f6044c1 am: 98d15b15a7 am: 1fca88c97b

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

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