Revert incorrect TM Branching Stage 4 merges am: df9b86f15b am: 9954c73afc am: ea8353a877 am: f23d5cc054

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

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