Have "Win7 FYI*(AMD)" bots retry flaky end2end tests

We've seen a number of flaky failures with Windows7 FYI AMD bots
lately (i.e. different tests occasionally fail once).  This is taking
too much Wrangler attention.  This CL should quiet down the flakes.

Bug: angleproject:5513
Change-Id: Ic5af13c71da76c1f5a9edb7746201559d455df23
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2619318Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Ian Elliott <ianelliott@google.com>
Auto-Submit: Ian Elliott <ianelliott@google.com>
Cr-Commit-Position: refs/heads/master@{#842096}

testing/buildbot/chromium.gpu.fyi.json

@@ -37169,7 +37169,8 @@
         "args": [
           "angle_end2end_tests",
           "--gtest_filter=-*Vulkan_SwiftShader*",
-          "--bot-mode"
+          "--bot-mode",
+          "--flaky-retries=2"
         ],
         "merge": {
           "args": [],
@@ -37862,7 +37863,8 @@
         "args": [
           "angle_end2end_tests",
           "--gtest_filter=-*Vulkan_SwiftShader*",
-          "--bot-mode"
+          "--bot-mode",
+          "--flaky-retries=2"
         ],
         "merge": {
           "args": [],

testing/buildbot/test_suites.pyl

@@ -6070,6 +6070,19 @@
       'gpu_webgl2_conformance_validating_telemetry_tests',
     ],
 
+    'gpu_fyi_win7_amd_gtests': [
+      'gpu_angle_end2end_with_retry_gtests',
+      'gpu_angle_gles1_conformance_gtests',
+      'gpu_angle_unit_gtests',
+      'gpu_angle_white_box_gtests',
+      'gpu_common_gtests_passthrough',
+      'gpu_desktop_specific_gtests',
+      'gpu_fyi_and_optional_non_linux_gtests',
+      'gpu_fyi_and_optional_win_specific_gtests',
+      'gpu_gles2_conform_gtests',
+      'gpu_swiftshader_gtests',
+    ],
+
     'gpu_fyi_win7_gtests': [
       'gpu_angle_end2end_gtests',
       'gpu_angle_gles1_conformance_gtests',

testing/buildbot/waterfalls.pyl

@@ -4731,7 +4731,7 @@
           'win7_amd_r7_240',
         ],
         'test_suites': {
-          'gtest_tests': 'gpu_fyi_win7_gtests',
+          'gtest_tests': 'gpu_fyi_win7_amd_gtests',
           'gpu_telemetry_tests': 'gpu_fyi_win_debug_telemetry_tests',
         },
       },
@@ -4743,7 +4743,7 @@
           'win7_amd_r7_240',
         ],
         'test_suites': {
-          'gtest_tests': 'gpu_fyi_win7_gtests',
+          'gtest_tests': 'gpu_fyi_win7_amd_gtests',
           'gpu_telemetry_tests': 'gpu_fyi_win_nvidia_amd_release_telemetry_tests',
         },
       },