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

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

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