[devicelab] Reland adding smoke tests for Catalina/Android testing (#39361)

diff --git a/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle__benchmark.dart b/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle__benchmark.dart
index eddaf18..37b3255 100644
--- a/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle__benchmark.dart
+++ b/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle__benchmark.dart

@@ -6,9 +6,7 @@
 
 import 'package:flutter_devicelab/tasks/hot_mode_tests.dart';
 import 'package:flutter_devicelab/framework/framework.dart';
-import 'package:flutter_devicelab/framework/adb.dart';
 
 Future<void> main() async {
-  deviceOperatingSystem = DeviceOperatingSystem.ios;
   await task(createHotModeTest());
 }

diff --git a/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle_ios__benchmark.dart b/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle_ios__benchmark.dart
new file mode 100644
index 0000000..eddaf18
--- /dev/null
+++ b/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle_ios__benchmark.dart

@@ -0,0 +1,14 @@
+// Copyright (c) 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:flutter_devicelab/tasks/hot_mode_tests.dart';
+import 'package:flutter_devicelab/framework/framework.dart';
+import 'package:flutter_devicelab/framework/adb.dart';
+
+Future<void> main() async {
+  deviceOperatingSystem = DeviceOperatingSystem.ios;
+  await task(createHotModeTest());
+}

diff --git a/dev/devicelab/bin/tasks/smoke_catalina_start_up.dart b/dev/devicelab/bin/tasks/smoke_catalina_start_up.dart
index 81e7edb..848f103 100644
--- a/dev/devicelab/bin/tasks/smoke_catalina_start_up.dart
+++ b/dev/devicelab/bin/tasks/smoke_catalina_start_up.dart

@@ -5,11 +5,9 @@
 import 'dart:async';
 
 import 'package:flutter_devicelab/tasks/perf_tests.dart';
-import 'package:flutter_devicelab/framework/adb.dart';
 import 'package:flutter_devicelab/framework/framework.dart';
 
 Future<void> main() async {
-  deviceOperatingSystem = DeviceOperatingSystem.ios;
   // It's intended to use the Gallery startup test as a smoke test on macOS
   // Catalina.
   await task(createFlutterGalleryStartupTest());

diff --git a/dev/devicelab/bin/tasks/smoke_catalina_start_up_ios.dart b/dev/devicelab/bin/tasks/smoke_catalina_start_up_ios.dart
new file mode 100644
index 0000000..81e7edb
--- /dev/null
+++ b/dev/devicelab/bin/tasks/smoke_catalina_start_up_ios.dart

@@ -0,0 +1,16 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:flutter_devicelab/tasks/perf_tests.dart';
+import 'package:flutter_devicelab/framework/adb.dart';
+import 'package:flutter_devicelab/framework/framework.dart';
+
+Future<void> main() async {
+  deviceOperatingSystem = DeviceOperatingSystem.ios;
+  // It's intended to use the Gallery startup test as a smoke test on macOS
+  // Catalina.
+  await task(createFlutterGalleryStartupTest());
+}

diff --git a/dev/devicelab/manifest.yaml b/dev/devicelab/manifest.yaml
index 2108b01..2b07f83 100644
--- a/dev/devicelab/manifest.yaml
+++ b/dev/devicelab/manifest.yaml

@@ -517,19 +517,33 @@
     stage: devicelab_ios
     required_agent_capabilities: ["mac/ios"]
 
-  smoke_catalina_start_up:
+  smoke_catalina_start_up_ios:
     description: >
       A smoke test that runs on macOS Catalina, which is a clone of the Gallery startup latency test.
     stage: devicelab_ios
     required_agent_capabilities: ["mac-catalina/ios"]
 
-  smoke_catalina_hot_mode_dev_cycle__benchmark:
+  smoke_catalina_hot_mode_dev_cycle_ios__benchmark:
     description: >
       A some test that runs on macOS Catalina, which is a clone of the Dart VM hot patching performance benchmarking.
     stage: devicelab_ios
     flaky: true
     required_agent_capabilities: ["mac-catalina/ios"]
 
+  smoke_catalina_start_up:
+    description: >
+      A smoke test that runs on macOS Catalina, which is a clone of the Gallery startup latency test.
+    stage: devicelab
+    flaky: true
+    required_agent_capabilities: ["mac-catalina/android"]
+
+  smoke_catalina_hot_mode_dev_cycle__benchmark:
+    description: >
+      A some test that runs on macOS Catalina, which is a clone of the Dart VM hot patching performance benchmarking.
+    stage: devicelab
+    flaky: true
+    required_agent_capabilities: ["mac-catalina/android"]
+
   # Tests running on Windows host
 
   flavors_test_win: