Adjust sharding for MM x86 and Pie x86 builders

Increase shard number of network_service_out_of_process_content_browsertests
and content_browsertests to mitigate the timeout error

And decrease shard number of network_service_webview_instrumentation_test_apk
since it is not necessary to keep its runtime that short

Bug: 1119314
Change-Id: I4990d034295e72e1eceb0bf636b7ccbd744f7792
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2411548
Reviewed-by: Ben Pastene <[email protected]>
Commit-Queue: Haiyang Pan <[email protected]>
Cr-Commit-Position: refs/heads/master@{#807224}
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index c7e06359..571b5d6 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -972,6 +972,9 @@
         'args': [
           '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_p.content_browsertests.filter',
         ],
+        'swarming': {
+          'shards': 15,
+        },
       },
       'linux-blink-heap-concurrent-marking-tsan-rel': {
         'swarming': {
@@ -1999,7 +2002,7 @@
           '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_m.content_browsertests.filter',
         ],
         'swarming': {
-          'shards': 10,
+          'shards': 15,
         },
       },
       'android-nougat-arm64-rel': {
@@ -2013,7 +2016,7 @@
           '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_p.content_browsertests.filter',
         ],
         'swarming': {
-          'shards': 10,
+          'shards': 15,
         },
       },
     },
@@ -2060,10 +2063,18 @@
       'android-marshmallow-x86-rel', # crbug.com/1098111
     ],
     'modifications': {
+      'android-marshmallow-x86-rel-non-cq': {
+        'swarming': {
+          'shards': 15,
+        },
+      },
       'android-pie-x86-rel': {
         'args': [
           '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.webview_instrumentation_test_apk.filter',
         ],
+        'swarming': {
+          'shards': 15,
+        },
       },
     },
   },