Change WebApk app-id prefix from 'webapk:' to 'webapk-'

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

Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java
index 0758d2a5bbee8819d1caad7d485932ffc7cf5d71..f55a8956132718e02423967b7bb15ed1e9d2f1c3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java
@@ -15,6 +15,7 @@ import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.banners.InstallerDelegate;
 import org.chromium.chrome.browser.browsing_data.UrlFilter;
 import org.chromium.chrome.browser.browsing_data.UrlFilterBridge;
+import org.chromium.webapk.lib.common.WebApkConstants;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -193,7 +194,11 @@ public class WebappRegistry {
             WebappDataStorage storage = entry.getValue();
             String webApkPackage = storage.getWebApkPackageName();
             if (webApkPackage != null) {
-                if (isWebApkInstalled(webApkPackage)) {
+                // Prefix check that the key matches the current scheme instead of an old
+                // deprecated naming scheme and that the WebApk is still installed. The former is
+                // necessary as we migrate away from the old naming scheme and garbage collect.
+                if (entry.getKey().startsWith(WebApkConstants.WEBAPK_ID_PREFIX)
+                        && isWebApkInstalled(webApkPackage)) {
                     continue;
                 }
             } else if ((currentTime - storage.getLastUsedTime())