Try to fix BackgroundServiceStartNotAllowedException for Android stop

We see quite a few of these exceptions. We're allowed to send the intent
to the Android app, but once it receives it, it's still in the
background, and it's not allowed to send an intent to the background VPN
service, so the service never actually shuts down. Doesn't seem to
happen all the time, but just on some devices. This fix should clean
that up nicely.

Author: pimterry

src/interceptors/android/android-adb-interceptor.ts

@@ -168,12 +168,20 @@ export class AndroidAdbInterceptor implements Interceptor {
         const deviceIds = this.deviceProxyMapping[port] || [];
 
         return Promise.all(
-            deviceIds.map(deviceId => {
+            deviceIds.map(async (deviceId) => {
                 const deviceClient = new DeviceClient(this.adbClient, deviceId);
-                deviceClient.startActivity({
+
+                // Bring app to the front, as otherwise it can't run intents (to tell
+                // the background service to stop the VPN)
+                await bringToFront(
+                    deviceClient,
+                    'tech.httptoolkit.android.v1/tech.httptoolkit.android.MainActivity'
+                ).catch(logError); // Not that important, so we continue if this fails somehow
+
+                await deviceClient.startActivity({
                     wait: true,
                     action: 'tech.httptoolkit.android.DEACTIVATE'
-                })
+                });
             })
         );
     }