handle any RPCError due to vm service disconnection in flutter run (#156346)

Follow-up to flutter/flutter#153714. While reading through run.dart, I noticed we missed a case.

Author: andrewkolos

packages/flutter_tools/lib/src/commands/run.dart

@@ -856,7 +856,8 @@ class RunCommand extends RunCommandBase {
         throwToolExit(null, exitCode: result);
       }
     } on RPCError catch (error) {
-      if (error.code == RPCErrorCodes.kServiceDisappeared) {
+      if (error.code == RPCErrorCodes.kServiceDisappeared ||
+          error.message.contains('Service connection disposed')) {
         throwToolExit('Lost connection to device.');
       }
       rethrow;

packages/flutter_tools/test/commands.shard/hermetic/run_test.dart

@@ -1096,16 +1096,31 @@ void main() {
     });
   });
 
-  testUsingContext('Flutter run catches service has disappear errors and throws a tool exit', () async {
+  testUsingContext('Flutter run catches catches errors due to vm service disconnection and throws a tool exit', () async {
     final FakeResidentRunner residentRunner = FakeResidentRunner();
-    residentRunner.rpcError = RPCError('flutter._listViews', RPCErrorCodes.kServiceDisappeared, '');
+    residentRunner.rpcError = RPCError(
+      'flutter._listViews',
+      RPCErrorCodes.kServiceDisappeared,
+      '',
+    );
     final TestRunCommandWithFakeResidentRunner command = TestRunCommandWithFakeResidentRunner();
     command.fakeResidentRunner = residentRunner;
 
     await expectToolExitLater(createTestCommandRunner(command).run(<String>[
       'run',
       '--no-pub',
     ]), contains('Lost connection to device.'));
+
+    residentRunner.rpcError = RPCError(
+      'flutter._listViews',
+      RPCErrorCodes.kServerError,
+      'Service connection disposed.',
+    );
+
+    await expectToolExitLater(createTestCommandRunner(command).run(<String>[
+      'run',
+      '--no-pub',
+    ]), contains('Lost connection to device.'));
   }, overrides: <Type, Generator>{
     Cache: () => Cache.test(processManager: FakeProcessManager.any()),
     FileSystem: () => MemoryFileSystem.test(),