Re-enable android-marshmallow-arm64-rel.

The Android capacity for android-marshmallow-arm64-rel is mostly
recovered, so it is being re-enabled so that APAC and EMEA can get
Android M coverage.

Bug: 1108842
Change-Id: Ie865ced7efcdaa8357068db616e88801b8247840
No-Tree-Checks: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2316446
Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: Erik Staab <estaab@chromium.org>
Commit-Queue: Erik Staab <estaab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791298}

infra/config/generated/commit-queue.cfg

@@ -202,7 +202,8 @@ config_groups {
       }
       builders {
         name: "chromium/try/android-marshmallow-arm64-rel"
-        includable_only: true
+        location_regexp: ".*"
+        location_regexp_exclude: "infra/config/.+"
       }
       builders {
         name: "chromium/try/android-marshmallow-x86-fyi-rel"
@@ -1538,7 +1539,8 @@ config_groups {
       }
       builders {
         name: "chromium/try-m84/android-marshmallow-arm64-rel"
-        includable_only: true
+        location_regexp: ".*"
+        location_regexp_exclude: "infra/config/.+"
       }
       builders {
         name: "chromium/try-m84/android-pie-arm64-dbg"
@@ -1978,7 +1980,8 @@ config_groups {
       }
       builders {
         name: "chromium/try-m85/android-marshmallow-arm64-rel"
-        includable_only: true
+        location_regexp: ".*"
+        location_regexp_exclude: "infra/config/.+"
       }
       builders {
         name: "chromium/try-m85/android-marshmallow-x86-rel"

infra/config/generated/cq-builders.md

@@ -21,6 +21,8 @@ These builders must pass before a CL may land that affects files outside of
 
 * [android-lollipop-arm-rel](https://ci.chromium.org/p/chromium/builders/try/android-lollipop-arm-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+android-lollipop-arm-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+android-lollipop-arm-rel))
 
+* [android-marshmallow-arm64-rel](https://ci.chromium.org/p/chromium/builders/try/android-marshmallow-arm64-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+android-marshmallow-arm64-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+android-marshmallow-arm64-rel))
+
 * [android-pie-arm64-rel](https://ci.chromium.org/p/chromium/builders/try/android-pie-arm64-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+android-pie-arm64-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+android-pie-arm64-rel))
 
 * [android_compile_dbg](https://ci.chromium.org/p/chromium/builders/try/android_compile_dbg) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+android_compile_dbg)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+android_compile_dbg))

infra/config/subprojects/chromium/try.star

@@ -122,8 +122,7 @@ try_.chromium_android_builder(
     goma_jobs = goma.jobs.J300,
     ssd = True,
     use_java_coverage = True,
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(),
+    tryjob = try_.job(),
 )
 
 try_.chromium_android_builder(

infra/config/subprojects/chromium/versioned/m84/buckets/try.star

@@ -101,8 +101,7 @@ try_.chromium_android_builder(
     goma_jobs = goma.jobs.J300,
     ssd = True,
     use_java_coverage = True,
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(),
+    tryjob = try_.job(),
 )
 
 try_.chromium_android_builder(

infra/config/subprojects/chromium/versioned/m85/buckets/try.star

@@ -94,8 +94,7 @@ try_.chromium_android_builder(
     goma_jobs = goma.jobs.J300,
     ssd = True,
     use_java_coverage = True,
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(),
+    tryjob = try_.job(),
 )
 
 try_.chromium_android_builder(