Snap for 11381838 from bcecb5b4eaae5882588a26ad8c67086ce2de99cc to mainline-odp-release

Change-Id: I09df6adc7ff662f2bb948bbc15c802722948b422
diff --git a/tests/automotive/health/dial/tests/Android.bp b/tests/automotive/health/dial/tests/Android.bp
index 497f865..c88fb13 100644
--- a/tests/automotive/health/dial/tests/Android.bp
+++ b/tests/automotive/health/dial/tests/Android.bp
@@ -34,5 +34,5 @@
         "platform-test-options",
     ],
     srcs: ["src/**/*.java"],
-    test_suites: ["catbox"],
+    test_suites: ["ats", "catbox"],
 }
diff --git a/tests/automotive/health/dial/tests/src/android/platform/scenario/dial/OpenColdAppMicrobenchmark.java b/tests/automotive/health/dial/tests/src/android/platform/scenario/dial/OpenColdAppMicrobenchmark.java
new file mode 100644
index 0000000..7a4ec2c
--- /dev/null
+++ b/tests/automotive/health/dial/tests/src/android/platform/scenario/dial/OpenColdAppMicrobenchmark.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2021 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.
+ */
+package android.platform.test.scenario.dial;
+
+import android.platform.test.microbenchmark.Microbenchmark;
+import android.platform.test.scenario.ColdAppStartupRunRule;
+
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+@RunWith(Microbenchmark.class)
+public class OpenColdAppMicrobenchmark extends OpenApp {
+
+    @Rule
+    public ColdAppStartupRunRule mAppStartupRunRule = new ColdAppStartupRunRule<>(sHelper.get());
+}
diff --git a/tests/automotive/health/dial/tests/src/android/platform/scenario/dial/OpenHotAppMicrobenchmark.java b/tests/automotive/health/dial/tests/src/android/platform/scenario/dial/OpenHotAppMicrobenchmark.java
new file mode 100644
index 0000000..f0f7539
--- /dev/null
+++ b/tests/automotive/health/dial/tests/src/android/platform/scenario/dial/OpenHotAppMicrobenchmark.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2021 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.
+ */
+package android.platform.test.scenario.dial;
+
+import android.platform.test.microbenchmark.Microbenchmark;
+import android.platform.test.scenario.HotAppStartupRunRule;
+
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+@RunWith(Microbenchmark.class)
+public class OpenHotAppMicrobenchmark extends OpenApp {
+
+    @Rule
+    public HotAppStartupRunRule mAppStartupRunRule = new HotAppStartupRunRule<>(sHelper.get());
+}
diff --git a/tests/automotive/health/settings/tests/Android.bp b/tests/automotive/health/settings/tests/Android.bp
index 0f102f5..5ca2eb0 100644
--- a/tests/automotive/health/settings/tests/Android.bp
+++ b/tests/automotive/health/settings/tests/Android.bp
@@ -34,5 +34,5 @@
         "platform-test-options",
     ],
     srcs: ["src/**/*.java"],
-    test_suites: ["catbox"],
+    test_suites: ["ats", "catbox"],
 }
diff --git a/tests/automotive/health/settings/tests/src/android/platform/scenario/settings/OpenColdAppMicrobenchmark.java b/tests/automotive/health/settings/tests/src/android/platform/scenario/settings/OpenColdAppMicrobenchmark.java
new file mode 100644
index 0000000..8d5b2ca
--- /dev/null
+++ b/tests/automotive/health/settings/tests/src/android/platform/scenario/settings/OpenColdAppMicrobenchmark.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2023 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.
+ */
+
+package android.platform.test.scenario.settings;
+
+import android.platform.test.microbenchmark.Microbenchmark;
+import android.platform.test.scenario.ColdAppStartupRunRule;
+
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+@RunWith(Microbenchmark.class)
+public class OpenColdAppMicrobenchmark extends OpenApp {
+
+    @Rule
+    public ColdAppStartupRunRule mAppStartupRunRule = new ColdAppStartupRunRule<>(sHelper.get());
+}
diff --git a/tests/automotive/health/settings/tests/src/android/platform/scenario/settings/OpenHotAppMicrobenchmark.java b/tests/automotive/health/settings/tests/src/android/platform/scenario/settings/OpenHotAppMicrobenchmark.java
new file mode 100644
index 0000000..b4bc867
--- /dev/null
+++ b/tests/automotive/health/settings/tests/src/android/platform/scenario/settings/OpenHotAppMicrobenchmark.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2023 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.
+ */
+
+package android.platform.test.scenario.settings;
+
+import android.platform.test.microbenchmark.Microbenchmark;
+import android.platform.test.scenario.HotAppStartupRunRule;
+
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+@RunWith(Microbenchmark.class)
+public class OpenHotAppMicrobenchmark extends OpenApp {
+
+    @Rule
+    public HotAppStartupRunRule mAppStartupRunRule = new HotAppStartupRunRule<>(sHelper.get());
+}