Revert "Increase angle_end2end_tests batch timeout on Win7 NVIDIA"

This reverts commit a8e2d2c.

Reason for revert: performance regression fixed in
KhronosGroup/Vulkan-ValidationLayers#3452,
rolled into Chromium in crrev.com/934959.

Original change's description:
> Increase angle_end2end_tests batch timeout on Win7 NVIDIA
>
> To unblock rolling VVL into Chromium,
> which have a performance regression on this platform.
>
> Bug: 1249209
> Change-Id: Ic66a1309b0482c41d8057bfea13303f2a306923d
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3227076
> Auto-Submit: Yuly Novikov <ynovikov@chromium.org>
> Commit-Queue: Jamie Madill <jmadill@chromium.org>
> Reviewed-by: Jamie Madill <jmadill@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#932483}

Bug: 1249209
Change-Id: I80c579110027037a786ca863de423c3628c45fc8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3246093
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/main@{#935243}

testing/buildbot/chromium.angle.json

@@ -3411,8 +3411,7 @@
         "args": [
           "angle_end2end_tests",
           "--gtest_filter=-*Vulkan_SwiftShader*",
-          "--bot-mode",
-          "--batch-timeout=600"
+          "--bot-mode"
         ],
         "merge": {
           "args": [],

testing/buildbot/chromium.gpu.fyi.json

@@ -37196,8 +37196,7 @@
         "args": [
           "angle_end2end_tests",
           "--gtest_filter=-*Vulkan_SwiftShader*",
-          "--bot-mode",
-          "--batch-timeout=600"
+          "--bot-mode"
         ],
         "merge": {
           "args": [],
@@ -38013,8 +38012,7 @@
         "args": [
           "angle_end2end_tests",
           "--gtest_filter=-*Vulkan_SwiftShader*",
-          "--bot-mode",
-          "--batch-timeout=600"
+          "--bot-mode"
         ],
         "merge": {
           "args": [],

testing/buildbot/test_suite_exceptions.pyl

@@ -94,29 +94,11 @@
           '--max-processes=1',
         ],
       },
-      # TODO(crbug.com/1249209) Remove when VVL performance is fixed
-      'Win7 FYI Release (NVIDIA)': {
-        'args': [
-          '--batch-timeout=600',
-        ],
-      },
-      # TODO(crbug.com/1249209) Remove when VVL performance is fixed
-      'Win7 FYI x64 Release (NVIDIA)': {
-        'args': [
-          '--batch-timeout=600',
-        ],
-      },
       'win10-angle-x64-intel': {
         'args': [
           '--max-processes=1',
         ],
       },
-      # TODO(crbug.com/1249209) Remove when VVL performance is fixed
-      'win7-angle-x64-nvidia': {
-        'args': [
-          '--batch-timeout=600',
-        ],
-      },
     },
     'replacements': {
       'Linux FYI Release (AMD RX 5500 XT)': {