Try to be more consistent about deleting test apps in devicelab logic (#146931)

Fixes #137555.

This is an updated version of flutter/flutter#146856, which was reverted in flutter/flutter#146927. The first commit is identical to the original PR, and subsequent commits are the fixes to address failures detected in devicelab post-commit.

Author: Hixie

dev/devicelab/bin/tasks/complex_layout_semantics_perf.dart

@@ -32,6 +32,7 @@ void main() {
         '-d',
         deviceId,
       ]);
+      await device.uninstallApp();
     });
 
     final String outputPath = Platform.environment['FLUTTER_TEST_OUTPUTS_DIR'] ?? p.join(complexLayoutPath, 'build');

dev/devicelab/bin/tasks/drive_perf_debug_warning.dart

@@ -16,6 +16,7 @@ Future<String> _runWithMode(String mode, String deviceId) async {
     '-d',
     deviceId,
   ]);
+  await evalFlutter('install', options: <String>['--uninstall-only', '-d', deviceId]);
   return stderr.toString();
 }
 

dev/devicelab/bin/tasks/hello_world__memory.dart

@@ -29,6 +29,7 @@ class HelloWorldMemoryTest extends MemoryTest {
     await recordStart();
     await Future<void>.delayed(const Duration(milliseconds: 3000));
     await recordEnd();
+    await device!.uninstallApp();
   }
 }
 

dev/devicelab/bin/tasks/hello_world_impeller.dart

@@ -65,6 +65,7 @@ Future<TaskResult> run() async {
     await Future<void>.delayed(const Duration(seconds: 30));
     process.stdin.write('q');
     await adb.cancel();
+    await device.uninstallApp();
   });
 
   if (!isUsingValidationLayers || impellerBackendCount != 1) {

dev/devicelab/bin/tasks/platform_channels_benchmarks.dart

@@ -7,6 +7,5 @@ import 'package:flutter_devicelab/framework/framework.dart' show task;
 import 'package:flutter_devicelab/tasks/platform_channels_benchmarks.dart' as platform_channels_benchmarks;
 
 Future<void> main() async {
-  await task(
-      platform_channels_benchmarks.runTask(DeviceOperatingSystem.android));
+  await task(platform_channels_benchmarks.runTask(DeviceOperatingSystem.android));
 }

dev/devicelab/bin/tasks/route_test_ios.dart

@@ -16,9 +16,9 @@ void main() {
     final Device device = await devices.workingDevice;
     await device.unlock();
     final Directory appDir = dir(path.join(flutterDirectory.path, 'dev/integration_tests/ui'));
-    section('TEST WHETHER `flutter drive --route` WORKS on IOS');
+    section('TEST WHETHER `flutter drive --route` WORKS ON iOS');
     await inDirectory(appDir, () async {
-      return flutter(
+      await flutter(
         'drive',
         options: <String>[
           '--verbose',
@@ -29,6 +29,7 @@ void main() {
           'lib/route.dart',
         ],
       );
+      await device.uninstallApp();
     });
     return TaskResult.success(null);
   });

dev/devicelab/bin/tasks/service_extensions_test.dart

@@ -118,6 +118,7 @@ void main() {
       if (result != 0) {
         throw 'Received unexpected exit code $result from run process.';
       }
+      await device.uninstallApp();
     });
     return TaskResult.success(null);
   });

dev/devicelab/lib/tasks/android_choreographer_do_frame_test.dart

@@ -161,6 +161,13 @@ Future<void> main() async {
         await stderr.cancel();
         run.kill();
 
+        await inDirectory(path.join(tempDir.path, 'app'), () async {
+          await flutter(
+            'install',
+            options: <String>['--uninstall-only'],
+          );
+        });
+
         if (nextCompleterIdx == sentinelCompleters.values.length) {
           return TaskResult.success(null);
         }

dev/devicelab/lib/tasks/android_lifecycles_test.dart

@@ -154,6 +154,13 @@ void main() {
         await lifecycles.close();
         await stdout.cancel();
         await stderr.cancel();
+
+        await inDirectory(path.join(tempDir.path, 'app'), () async {
+          await flutter(
+            'install',
+            options: <String>['--uninstall-only'],
+          );
+        });
         return TaskResult.success(null);
       }
 

dev/devicelab/lib/tasks/android_verified_input_test.dart

@@ -53,7 +53,7 @@ class DriverTest {
         ...extraOptions,
       ];
       await flutter('drive', options: options, environment: environment);
-
+      await flutter('install', options: <String>['--uninstall-only', '-d', deviceId], environment: environment);
       return TaskResult.success(null);
     });
   }