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

dev/devicelab/manifest.yaml

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: