Disable monochrome_apk_checker on marshmallow-x86.

The new typ-based version of this test doesn't support the
--avd-config flag, so we disable the test temporarily on Android
emulator bots until it does.

Tbr: pkotwicz@chromium.org
Bug: 1137405
Change-Id: Ieae25138a160d351813dbdc7205070129a082eea
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2466057Reviewed-by: Dirk Pranke <dpranke@google.com>
Reviewed-by: Egor Pasko <pasko@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#816338}

testing/buildbot/chromium.android.json

@@ -33778,42 +33778,6 @@
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test_id_prefix": "ninja://components:components_perftests/"
-      },
-      {
-        "args": [
-          "--avd-config=../../tools/android/avd/proto/generic_android23.textpb"
-        ],
-        "isolate_name": "monochrome_public_apk_checker",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "monochrome_public_apk_checker",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "device_os": null,
-              "device_type": null,
-              "machine_type": "n1-standard-4",
-              "os": "Ubuntu-16.04",
-              "pool": "chromium.tests.avd"
-            }
-          ],
-          "named_caches": [
-            {
-              "name": "avd_generic_android23",
-              "path": ".android"
-            },
-            {
-              "name": "system_images_android_23_google_apis_x86",
-              "path": ".emulator_sdk"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test_id_prefix": "ninja://chrome/android/monochrome:monochrome_public_apk_checker/"
       }
     ]
   },

testing/buildbot/test_suite_exceptions.pyl

@@ -1693,6 +1693,11 @@
         },
       },
     },
+    'remove_from': [
+      # TODO(crbug.com/1137405): Re-enable once the test harness supports
+      # the --avd-config flag.
+      'android-marshmallow-x86-rel-non-cq',
+    ],
   },
   'monochrome_public_test_ar_apk': {
     'modifications': {