From b8f85204a63cef650414c70102078d7b6947417f Mon Sep 17 00:00:00 2001
From: jdesprez <jdesprez@google.com>
Date: Tue, 13 Mar 2018 13:43:42 -0700
Subject: [PATCH] Update the base autogenerated config template for instru

For APCT auto-generated configuration, the template will
include the test-suite-tag that will allow it to be
picked up automatically.

Test: none
Bug: 74440293
Change-Id: Ia82e8287f212f4daec97523394517bfbbe7a86d3
---
 core/instrumentation_test_config_template.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/instrumentation_test_config_template.xml b/core/instrumentation_test_config_template.xml
index a0badabca..18ea676af 100644
--- a/core/instrumentation_test_config_template.xml
+++ b/core/instrumentation_test_config_template.xml
@@ -15,7 +15,10 @@
 -->
 <!-- This test config file is auto-generated. -->
 <configuration description="Runs {LABEL}.">
+    <option name="test-suite-tag" value="apct" />
+    <option name="test-suite-tag" value="apct-instrumentation" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="{MODULE}.apk" />
     </target_preparer>