Disconnect from WebAPK service when the WebAPK is stopped

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
index 2cd5ea50d829ef8efec3498d910f8cdb120fc8a4..74d23ae4e3b06f981e184cc3152e90b8138eec6d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
@@ -6,9 +6,11 @@ package org.chromium.chrome.browser.webapps;
 
 import android.content.Intent;
 
+import org.chromium.base.ContextUtils;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.ui.base.PageTransition;
+import org.chromium.webapk.lib.client.WebApkServiceConnectionManager;
 
 /**
  * An Activity is designed for WebAPKs (native Android apps) and displays a webapp in a nearly
@@ -39,4 +41,12 @@ public class WebApkActivity extends WebappActivity {
         // when WebAPKs are registered in WebappRegistry.
         initializeSplashScreenWidgets(backgroundColor, null);
     }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        String packageName = getWebappInfo().webApkPackageName();
+        WebApkServiceConnectionManager.getInstance().disconnect(
+                ContextUtils.getApplicationContext(), packageName);
+    }
 }