Disable ContentViewScrollingTest.testFling on emulators.

Bug: 1054841
Change-Id: I482dce770a291718ea5d86b4b0e2633c7cbefc13
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2080436
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746071}

testing/buildbot/chromium.android.fyi.json

@@ -2397,7 +2397,8 @@
         "args": [
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices",
-          "--avd-config=../../tools/android/avd/proto/generic_android23.textpb"
+          "--avd-config=../../tools/android/avd/proto/generic_android23.textpb",
+          "--gtest_filter=-ContentViewScrollingTest.testFling"
         ],
         "merge": {
           "args": [
@@ -2457,7 +2458,8 @@
           "--disable-features=NetworkServiceInProcess",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices",
-          "--avd-config=../../tools/android/avd/proto/generic_android23.textpb"
+          "--avd-config=../../tools/android/avd/proto/generic_android23.textpb",
+          "--gtest_filter=-ContentViewScrollingTest.testFling"
         ],
         "merge": {
           "args": [
@@ -6587,7 +6589,8 @@
         "args": [
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices",
-          "--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
+          "--avd-config=../../tools/android/avd/proto/generic_android28.textpb",
+          "--gtest_filter=-ContentViewScrollingTest.testFling"
         ],
         "merge": {
           "args": [
@@ -6647,7 +6650,8 @@
           "--disable-features=NetworkServiceInProcess",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices",
-          "--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
+          "--avd-config=../../tools/android/avd/proto/generic_android28.textpb",
+          "--gtest_filter=-ContentViewScrollingTest.testFling"
         ],
         "merge": {
           "args": [

testing/buildbot/test_suite_exceptions.pyl

@@ -552,6 +552,18 @@
       'android-asan',  # https://crbug.com/964562
       'android-code-coverage-native', # crbug/1018434
     ],
+    'modifications': {
+      'android-marshmallow-x86-fyi-rel': {
+        'args': [
+          '--gtest_filter=-ContentViewScrollingTest.testFling',
+        ],
+      },
+      'android-pie-x86-fyi-rel': {
+        'args': [
+          '--gtest_filter=-ContentViewScrollingTest.testFling',
+        ],
+      },
+    },
   },
   'content_unittests': {
     'remove_from': [
@@ -1344,6 +1356,18 @@
       'Marshmallow Tablet Tester',
       'android-code-coverage-native', # crbug/1018434
     ],
+    'modifications': {
+      'android-marshmallow-x86-fyi-rel': {
+        'args': [
+          '--gtest_filter=-ContentViewScrollingTest.testFling',
+        ],
+      },
+      'android-pie-x86-fyi-rel': {
+        'args': [
+          '--gtest_filter=-ContentViewScrollingTest.testFling',
+        ],
+      },
+    },
   },
   'network_service_webview_instrumentation_test_apk': {
     # Only run these on the phone testers for now due to capacity.