Merge "Fix package usage of instant app can be updated by unprivileged app" into sc-v2-dev

services/core/java/com/android/server/pm/PackageManagerService.java

@@ -12822,7 +12822,7 @@ public class PackageManagerService extends IPackageManager.Stub
                     return;
                 }
             } else {
-                if (isInstantApp(packageName, callingUserId)) {
+                if (isInstantAppInternal(packageName, callingUserId, Process.SYSTEM_UID)) {
                     return;
                 }
             }