emulator: promote content_browsertests on MM to non-FYI

This test suite is fairly stable in fyi MM, and the capacity of 4-core bots
looks suffcient.
Also increase the shard number to 20 given it runs a bit slower on 4-core bots


Bug: 997376, 1098111, 1116620
Change-Id: Ie2a6ab4a9be334d720837b3ebbb64537c8076cd7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2363648
Reviewed-by: Yuke Liao <[email protected]>
Commit-Queue: Haiyang Pan <[email protected]>
Cr-Commit-Position: refs/heads/master@{#799737}
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index 53a8b03..7fb8b5d 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -855,7 +855,6 @@
       'android-lollipop-arm-rel',
       # http://crbug.com/1060245#c30: due to low utility and capacity.
       'android-marshmallow-arm64-rel',
-      'android-marshmallow-x86-rel', # crbug.com/1098111
     ],
     'modifications': {
       'Cast Audio Linux': {
@@ -930,11 +929,13 @@
           'shards': 16,
         },
       },
-      'android-marshmallow-x86-fyi-rel': {
+      'android-marshmallow-x86-rel': {
         'args': [
           '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_m.content_browsertests.filter',
-          '-v', # TODO(crbug.com/1093602) Remove once the issue is resolved
         ],
+        'swarming': {
+          'shards': 20,
+        },
       },
       'android-nougat-arm64-rel': {
         'swarming': {