Android 13.0.0 release 33
Revert incorrect TM Branching Stage 4 merges am: cb3f6044c1 am: f112f77041

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

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