emulator: disable failed tests in chrome_public_test_apk for MM

Also disabled them in network_service_out_of_process_chrome_public_test_apk

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

Bug: 1056330, 1022533
Change-Id: Ib7a62842b74581014d4c1005ebaa72263aaf2dff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2227300
Reviewed-by: Yuke Liao <[email protected]>
Commit-Queue: Yuke Liao <[email protected]>
Auto-Submit: Haiyang Pan <[email protected]>
Cr-Commit-Position: refs/heads/master@{#774471}
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index eeefdc1c..35e72501d 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -657,6 +657,11 @@
           'service_account': '[email protected]'
         },
       },
+      'android-marshmallow-x86-fyi-rel': {
+        'args': [
+          '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_m.chrome_public_test_apk.filter',
+        ],
+      },
       'android-pie-arm64-rel': {
         'args': [
           '--test-launcher-filter-file=../../testing/buildbot/filters/android.pie_arm64_rel.chrome_public_test_apk.filter', # https://crbug.com/1010211
@@ -666,7 +671,7 @@
         'args': [
           '--avd-config=../../tools/android/avd/proto/generic_playstore_android28.textpb',
           # https://crbug.com/1046059
-          '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.chrome_public_test_apk.filter',
+          '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_m.chrome_public_test_apk.filter',
         ],
         'swarming': {
           'named_caches': [
@@ -1657,11 +1662,16 @@
           'Feature=RenderTest', # https://crbug.com/1068294
         ],
       },
+      'android-marshmallow-x86-fyi-rel': {
+        'args': [
+          '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_m.chrome_public_test_apk.filter',
+        ],
+      },
       'android-pie-x86-rel': {
         'args': [
           '--avd-config=../../tools/android/avd/proto/generic_playstore_android28.textpb',
           # https://crbug.com/1046059
-          '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.chrome_public_test_apk.filter',
+          '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_p.chrome_public_test_apk.filter',
         ],
         'swarming': {
           'named_caches': [