Revert incorrect TM Branching Stage 4 merges am: df9b86f15b am: 9954c73afc am: 4681300087 am: b5ce6c0852

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

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