Snap for 5588664 from 03af2e4c4b12036048f10dae7350ffd41d447187 to qt-c2f2-release

Change-Id: I84150f1bf9e86fb3c35c5dd33d43ba3801814b10
diff --git a/res/config/template/collectors/runtime-restart-collector.xml b/res/config/template/collectors/runtime-restart-collector.xml
new file mode 100644
index 0000000..41b61c4
--- /dev/null
+++ b/res/config/template/collectors/runtime-restart-collector.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<configuration description="Collects count and timestamps for device runtime restarts, if any." >
+    <!-- Disabled by default; can enable on a test-by-test basis. -->
+    <metrics_collector class="com.android.tradefed.device.metric.RuntimeRestartCollector">
+        <option name="disable" value="true" />
+    </metrics_collector>
+</configuration>
diff --git a/res/config/template/collectors/scenario-files-puller.xml b/res/config/template/collectors/scenario-files-puller.xml
index 1499273..54216bf 100644
--- a/res/config/template/collectors/scenario-files-puller.xml
+++ b/res/config/template/collectors/scenario-files-puller.xml
@@ -18,5 +18,6 @@
     <include name="template/collectors/incident-puller" />
     <include name="template/collectors/perfetto-puller" />
     <include name="template/collectors/reboot-reason-collector" />
+    <include name="template/collectors/runtime-restart-collector" />
 </configuration>