Revert "Run single_process_mash_interactive_ui_tests in main waterfall"

This reverts commit b90f388e.

Reason for revert: After enabling this in main waterfall following tests keep failing in single_process_mash_interactive_ui_tests:

TestAsNormalAndGuestUser/SpokenFeedbackTest.FocusShelf/0
TestAsNormalAndGuestUser/SpokenFeedbackTest.FocusShelf/1
LoggedInSpokenFeedbackTest.KeyboardShortcutViewer

Original change's description:
> Run single_process_mash_interactive_ui_tests in main waterfall
>
> It seems this is stable recently with the current filter.
> Let's run under the main waterfall.
>
> BUG=883523
> TEST=none
>
> Change-Id: Ia14281c1e5a276c5057ae7653547086347c3ee0c
> Reviewed-on: https://chromium-review.googlesource.com/c/1285055
> Reviewed-by: Scott Violet <sky@chromium.org>
> Commit-Queue: Jun Mukai <mukai@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#600462}

TBR=mukai@chromium.org,sky@chromium.org

Change-Id: I511a0b6101a5574b154981cd1aaac76c7d5d088f
No-Tree-Checks: true
No-Try: true
Bug: 883523
Reviewed-on: https://chromium-review.googlesource.com/c/1288158
Commit-Queue: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600676}

testing/buildbot/chromium.chromiumos.json

@@ -820,18 +820,6 @@
         },
         "test": "interactive_ui_tests"
       },
-      {
-        "args": [
-          "--enable-features=SingleProcessMash",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.interactive_ui_tests.filter"
-        ],
-        "name": "single_process_mash_interactive_ui_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "shards": 3
-        },
-        "test": "interactive_ui_tests"
-      },
       {
         "args": [
           "--enable-features=WebUIPolymer2",
@@ -1537,18 +1525,6 @@
         },
         "test": "interactive_ui_tests"
       },
-      {
-        "args": [
-          "--enable-features=SingleProcessMash",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.interactive_ui_tests.filter"
-        ],
-        "name": "single_process_mash_interactive_ui_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "shards": 3
-        },
-        "test": "interactive_ui_tests"
-      },
       {
         "args": [
           "--enable-features=WebUIPolymer2",

testing/buildbot/chromium.fyi.json

@@ -1615,6 +1615,17 @@
         },
         "test": "extensions_browsertests"
       },
+      {
+        "args": [
+          "--enable-features=SingleProcessMash",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.interactive_ui_tests.filter"
+        ],
+        "name": "single_process_mash_interactive_ui_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "interactive_ui_tests"
+      },
       {
         "args": [
           "--enable-features=VizDisplayCompositor"

testing/buildbot/chromium.memory.json

@@ -4639,19 +4639,6 @@
         },
         "test": "interactive_ui_tests"
       },
-      {
-        "args": [
-          "--enable-features=SingleProcessMash",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.interactive_ui_tests.filter",
-          "--test-launcher-print-test-stdio=always"
-        ],
-        "name": "single_process_mash_interactive_ui_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "shards": 3
-        },
-        "test": "interactive_ui_tests"
-      },
       {
         "args": [
           "--enable-features=WebUIPolymer2",
@@ -5970,25 +5957,6 @@
         },
         "test": "interactive_ui_tests"
       },
-      {
-        "args": [
-          "--enable-features=SingleProcessMash",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.interactive_ui_tests.filter",
-          "--test-launcher-print-test-stdio=always"
-        ],
-        "name": "single_process_mash_interactive_ui_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu-14.04"
-            }
-          ],
-          "shards": 3
-        },
-        "test": "interactive_ui_tests"
-      },
       {
         "args": [
           "--enable-features=WebUIPolymer2",

testing/buildbot/test_suites.pyl

@@ -1756,16 +1756,6 @@
           '--enable-features=SingleProcessMash',
         ],
       },
-      'single_process_mash_interactive_ui_tests': {
-        'test': 'interactive_ui_tests',
-        'args': [
-          '--enable-features=SingleProcessMash',
-          '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.interactive_ui_tests.filter',
-        ],
-        'swarming': {
-          'shards': 3,
-        },
-      },
       'ui_chromeos_unittests': {},
       'views_mus_unittests': {},
       'views_mus_interactive_ui_tests': {},
@@ -1838,6 +1828,13 @@
           '--enable-features=Mash',
         ],
       },
+      'single_process_mash_interactive_ui_tests': {
+        'test': 'interactive_ui_tests',
+        'args': [
+          '--enable-features=SingleProcessMash',
+          '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.interactive_ui_tests.filter',
+        ],
+      },
     },
 
     'memory_infra_isolated_scripts': {