DO NOT MERGE - Merge Android 13

Bug: 242648940
Merged-In: Ide4d8b5e74c27da5b38d8ad7d3a2dc47409e5cd6
Change-Id: Id7079f624a703cf5b6fb6ff4ac4fed4d8bc55edb
diff --git a/res/config/template/postprocessors/metric-file-aggregate.xml b/res/config/template/postprocessors/metric-file-aggregate.xml
new file mode 100644
index 0000000..43cc82d
--- /dev/null
+++ b/res/config/template/postprocessors/metric-file-aggregate.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2021 Google Inc. All Rights Reserved -->
+<configuration description="Aggregates metrics across multiple iterations of the same test and write the results to a text file." >
+    <metric_post_processor class="com.android.tradefed.postprocessor.MetricFilePostProcessor">
+        <option name="aggregate-similar-tests" value="true" />
+        <option name="enable-per-test-log" value="false" />
+    </metric_post_processor>
+</configuration>
diff --git a/res/config/template/preparers/temperature.xml b/res/config/template/preparers/temperature.xml
index 0b444fd..4ac29b8 100644
--- a/res/config/template/preparers/temperature.xml
+++ b/res/config/template/preparers/temperature.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2021 Google Inc. All Rights Reserved -->
 <configuration description="Configuration to wait for device to cool down." >
-    <target_preparer class="com.android.tradefed.targetprep.TemperatureThrottlingWaiter" />
+    <target_preparer class="com.android.tradefed.targetprep.TemperatureThrottlingWaiter">
+        <!-- Disabled by default; can be enabled on a test-by-test basis. -->
+        <option name="disable" value="true" />
+    </target_preparer>
 </configuration>