Disable ComposTestCase on Cuttlefish

It is very flaky, with a high level of OOM errors both inside &
outside the VM. This doesn't seem to indicate a real problem, but
causes presubmit problems.

Also revert commit a6a67730f0 and move
the test back to our presubmit. If that is successful, we can then do
the same for other TEST_MAPPING files.

Bug: 264496291
Test: atest ComposHostTestCases
Change-Id: I2487f555c35ffdb5610efb67146922762ee170a4

TEST_MAPPING

@@ -3,6 +3,9 @@
     {
       "name": "MicrodroidHostTestCases"
     },
+    {
+      "name": "ComposHostTestCases"
+    },
     {
       "name": "MicrodroidTestApp"
     },
@@ -32,9 +35,6 @@
     {
       "name": "ComposBenchmarkApp"
     },
-    {
-      "name": "ComposHostTestCases"
-    },
     {
       "name": "AVFHostTestCases"
     }

compos/tests/java/android/compos/test/ComposTestCase.java

@@ -23,6 +23,8 @@ import static com.android.tradefed.testtype.DeviceJUnit4ClassRunner.TestLogData;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
+import static org.junit.Assume.assumeFalse;
+
 import android.platform.test.annotations.RootPermissionTest;
 
 import com.android.microdroid.test.host.CommandRunner;
@@ -81,6 +83,8 @@ public final class ComposTestCase extends MicrodroidHostTestCaseBase {
     @Before
     public void setUp() throws Exception {
         assumeDeviceIsCapable(getDevice());
+        // We get a very high level of (apparently bogus) OOM errors on Cuttlefish (b/264496291).
+        assumeFalse("Skipping test on Cuttlefish", isCuttlefish());
 
         String value = getDevice().getProperty(SYSTEM_SERVER_COMPILER_FILTER_PROP_NAME);
         if (value == null) {