Revert incorrect TM Branching Stage 4 merges am: df9b86f15b am: 710f60a6d8 am: 32a06c2b4e am: f7573d8fb2

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

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