Run wpt tests for Android with 2 emulators.

As shown in the table: http://shortn/_AA2U6n2mje, run with 2 emulators
reduces the run time for about 30min, or 1/3 of the total run time.

Run with 3 emulators does not seem to help.

Also enabled wpt report for clank.

Bug: 1171555, 1190323
Change-Id: I4eff21e7624bba9bd479398a2d644fe65dff9e06
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3367746
Reviewed-by: Stephen Martinis <[email protected]>
Reviewed-by: Erik Staab <[email protected]>
Commit-Queue: Weizhong Xia <[email protected]>
Cr-Commit-Position: refs/heads/main@{#957297}
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index ca15da0..354df8b 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -1071,15 +1071,6 @@
       }
     }
   },
-  'chrome_public_wpt': {
-    'modifications': {
-      'android-web-platform-pie-x86-fyi-rel': {
-        'swarming': {
-          'shards': 18,
-        },
-      },
-    },
-  },
   'chrome_sizes': {
     'modifications': {
       'lacros-amd64-generic-chrome': {
@@ -2864,10 +2855,8 @@
       'android-webview-pie-x86-wpt-fyi-rel': {
         'args': [
           '--log-wptreport',
+          '--processes=2',
         ],
-        'swarming': {
-          'shards': 18,
-        },
       },
     },
   },
@@ -3489,19 +3478,13 @@
   },
   'weblayer_shell_wpt': {
     'modifications': {
-      # TODO(crbug.com/1171555): remove this when test can run with more emulators
-      'android-weblayer-pie-x86-wpt-fyi-rel': {
-        'swarming': {
-          'shards': 18,
-        },
-      },
       'android-weblayer-pie-x86-wpt-smoketest': {
         'args': [
           '--default-exclude',
-          '--include-file=../../third_party/blink/web_tests/android/WPTSmokeTestCases'
+          '--include-file=../../third_party/blink/web_tests/android/WPTSmokeTestCases',
         ],
         'swarming': {
-          'shards': 3,
+          'shards': 1,
         },
       },
     },