Make instrumentation test dependency on a support APK explicit

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index dc3e86cbe94c27ea2a67e76a39aa51d16b7a44db..5a306df1562d1b2699fef33c063b7e69b4e2f2a9 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1788,6 +1788,9 @@ template("android_apk") {
 #   srcjar_deps: List of srcjar dependencies. The .java files in the srcjars
 #      will be added to java_files and be included in this apk.
 #   apk_name: Name for final apk.
+#   support_apk_name: Name of a support apk. If present, the test runner script
+#      will install it on the device before running the instrumentation tests.
+#      That apk will need to be generated beside the test apk.
 #   final_apk_path: Path to final built apk. Default is
 #     $root_out_dir/apks/$apk_name.apk. Setting this will override apk_name.
 #   native_libs: List paths of native libraries to include in this apk. If these
@@ -1827,6 +1830,9 @@ template("instrumentation_test_apk") {
       if (defined(invoker.isolate_file)) {
         isolate_file = invoker.isolate_file
       }
+      if (defined(invoker.support_apk_name)) {
+        support_apk_name = invoker.support_apk_name
+      }
     }
   }