Re-enable Compos test cases

Also move all the AVF related tests to avf-presubmit, so they run on
real devices.

Partially reverts commit 26dcfc54164ba69fe30925245355efe06537c4e7,
now that the test is disabled on Cuttlefish.

Bug: 264496291
Test: Presubmit
Change-Id: Ic9ac7bd33d7fa3b23e67fc29f8d9c1658db618b8
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 4148002..9aa510b 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -16,14 +16,14 @@
                     "include-filter": "android.security.cts.SeamendcHostTest"
                 }
             ]
+        }
+    ],
+    "avf-presubmit": [
+        {
+            "name": "ComposHostTestCases"
         },
         {
             "name": "MicrodroidHostTestCases"
         }
-    ],
-    "avf-postsubmit": [
-        {
-            "name": "ComposHostTestCases"
-        }
     ]
 }