Revert incorrect TM Branching Stage 4 merges am: df9b86f15b

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

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