android: Update test suites in android-lollipop-arm-rel

Make them the same as the ones run on the to-be-retired android-kitkat-arm-rel

Bug: 1032336
Change-Id: I7916451b2a0bb2fb25cdba8147493326292de507
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2161660Reviewed-by: Ben Pastene <bpastene@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/master@{#762020}

testing/buildbot/test_suite_exceptions.pyl

@@ -34,6 +34,7 @@
     'remove_from': [
       # On chromium.android, these do not need to run prior to M.
       'android-kitkat-arm-rel',
+      'android-lollipop-arm-rel',
       'KitKat Phone Tester (dbg)',
       'KitKat Tablet Tester',
       'android-code-coverage-native', # crbug/1018434
@@ -619,6 +620,7 @@
       'android-asan',  # https://crbug.com/964562
       'android-code-coverage-native', # https://crbug.com/1018780
       'android-kitkat-arm-rel', # https://crbug.com/1060245
+      'android-lollipop-arm-rel', # https://crbug.com/1060245
     ],
     'modifications': {
       'Android CFI': {
@@ -1666,6 +1668,7 @@
       'android-asan',
       # Don't run on trybots; waterfall is enough.
       'android-kitkat-arm-rel',
+      'android-lollipop-arm-rel',
       'android-marshmallow-arm64-rel',
       'android-pie-arm64-rel',
       # No capacity for tablet testers.
@@ -1701,6 +1704,7 @@
       'android-asan',
       # Don't run on trybots; waterfall is enough.
       'android-kitkat-arm-rel',
+      'android-lollipop-arm-rel',
       'android-marshmallow-arm64-rel',
       'android-pie-arm64-rel',
       # No capacity for tablet testers.
@@ -1715,6 +1719,7 @@
       'android-asan',
       # Don't run on trybots; waterfall is enough.
       'android-kitkat-arm-rel',
+      'android-lollipop-arm-rel',
       'android-marshmallow-arm64-rel',
       'android-pie-arm64-rel',
       # No capacity for tablet testers.
@@ -1744,6 +1749,7 @@
       'android-asan',
       # Don't run on trybots; waterfall is enough.
       'android-kitkat-arm-rel',
+      'android-lollipop-arm-rel',
       'android-marshmallow-arm64-rel',
       'android-pie-arm64-rel',
       # No capacity for tablet testers.
@@ -1769,6 +1775,7 @@
     # Only run these on the phone testers for now due to capacity.
     'remove_from': [
       'android-kitkat-arm-rel',
+      'android-lollipop-arm-rel',
       'android-marshmallow-arm64-rel',
       'android-pie-arm64-rel',
       'KitKat Tablet Tester',
@@ -2449,6 +2456,7 @@
     'remove_from': [
       # This test frequently fails on Android, https://crbug.com/824959
       'android-kitkat-arm-rel',
+      'android-lollipop-arm-rel',
       'KitKat Phone Tester (dbg)',
       'KitKat Tablet Tester',
       # matching android builders, the test fails on these.

testing/buildbot/waterfalls.pyl

@@ -761,11 +761,8 @@
           'cronet_test_instrumentation_apk',
           'monochrome_static_initializers',
         ],
-        # TODO(crbug.com/1032336): Scale up these tests.
-        # TODO(hypan): Test if LMY48M works fine with tests that runs on
-        # current Lollipop Phone Tester
         'test_suites': {
-          'gtest_tests': 'android_lollipop_marshmallow_gtests',
+          'gtest_tests': 'chromium_android_gtests',
         },
         'os_type': 'android',
       },