Remove ANGLE tests from NV Shield TV.

This config is unsupported. Leave angle_unittests because they're
used with Chrome separate from ANGLE. This removes angle_end2end
and angle_perftests.

Bug: angleproject:5298
Change-Id: Ia7ddca4de7e2989fd7e2d375dec7a9a3bf942f39
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2517642Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823659}

testing/buildbot/chromium.gpu.fyi.json

@@ -3414,36 +3414,6 @@
   },
   "Android FYI Release (NVIDIA Shield TV)": {
     "gtest_tests": [
-      {
-        "args": [
-          "angle_end2end_tests",
-          "--gtest_filter=-*Vulkan_SwiftShader*",
-          "--shard-timeout=180",
-          "-v"
-        ],
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "containment_type": "AUTO",
-          "dimension_sets": [
-            {
-              "device_os": "N",
-              "device_os_type": "user",
-              "device_type": "foster",
-              "os": "Android",
-              "pool": "chromium.tests.gpu"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 4
-        },
-        "test": "angle_end2end_tests",
-        "test_id_prefix": "ninja://third_party/angle/src/tests:angle_end2end_tests/",
-        "use_isolated_scripts_api": true
-      },
       {
         "args": [
           "angle_unittests",
@@ -3604,41 +3574,6 @@
       }
     ],
     "isolated_scripts": [
-      {
-        "args": [
-          "angle_perftests",
-          "--non-telemetry=true",
-          "--gtest-benchmark-name=angle_perftests",
-          "-v",
-          "--one-frame-only",
-          "--test-timeout=100",
-          "--test-launcher-batch-limit=1"
-        ],
-        "isolate_name": "angle_perftests",
-        "merge": {
-          "args": [
-            "--smoke-test-mode"
-          ],
-          "script": "//tools/perf/process_perf_results.py"
-        },
-        "name": "angle_perftests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "containment_type": "AUTO",
-          "dimension_sets": [
-            {
-              "device_os": "N",
-              "device_os_type": "user",
-              "device_type": "foster",
-              "os": "Android",
-              "pool": "chromium.tests.gpu"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 6
-        },
-        "test_id_prefix": "ninja://third_party/angle/src/tests:angle_perftests/"
-      },
       {
         "args": [
           "context_lost",

testing/buildbot/test_suites.pyl

@@ -5262,6 +5262,12 @@
       'gpu_fyi_and_optional_non_linux_gtests',
     ],
 
+    'gpu_fyi_android_shieldtv_gtests': [
+      'gpu_angle_unit_gtests',
+      'gpu_common_gtests_validating',
+      'gpu_fyi_and_optional_non_linux_gtests',
+    ],
+
     'gpu_fyi_android_webgl2_and_gold_telemetry_tests': [
       'gpu_validating_telemetry_tests',
       'gpu_webgl2_conformance_gles_passthrough_telemetry_tests',

testing/buildbot/waterfalls.pyl

@@ -3572,8 +3572,7 @@
           'nougat_generic',
         ],
         'test_suites': {
-          'gtest_tests': 'gpu_fyi_android_gtests',
-          'isolated_scripts': 'gpu_angle_perf_smoke_isolated_scripts',
+          'gtest_tests': 'gpu_fyi_android_shieldtv_gtests',
           'gpu_telemetry_tests': 'gpu_common_telemetry_tests',
         },
       },