emulator: disabled failed tests in content_browsertests on MM

Also disabled them in network_service_out_of_process_content_browsertests

Also use separate filters on M and P for content_browsertests since failed
tests on them start diverging

Bug: 1056325, 1081969
Change-Id: Ida0a29736eb9a5532f29942de8a68a4c30ed2c69
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2225155
Auto-Submit: Haiyang Pan <[email protected]>
Reviewed-by: Yuke Liao <[email protected]>
Commit-Queue: Yuke Liao <[email protected]>
Cr-Commit-Position: refs/heads/master@{#773821}
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index 18db598..3dfd3329 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -840,12 +840,12 @@
       },
       'android-marshmallow-x86-fyi-rel': {
         'args': [
-          '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.content_browsertests.filter',
+          '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_m.content_browsertests.filter',
         ],
       },
       'android-pie-x86-rel': {
         'args': [
-          '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.content_browsertests.filter',
+          '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_p.content_browsertests.filter',
         ],
       },
       'linux-blink-heap-concurrent-marking-tsan-rel': {
@@ -1706,7 +1706,7 @@
     'modifications': {
       'android-marshmallow-x86-fyi-rel': {
         'args': [
-          '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.content_browsertests.filter',
+          '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_m.content_browsertests.filter',
         ],
         'swarming': {
           'shards': 10,
@@ -1714,7 +1714,7 @@
       },
       'android-pie-x86-rel': {
         'args': [
-          '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.content_browsertests.filter',
+          '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_p.content_browsertests.filter',
         ],
         'swarming': {
           'shards': 10,