Merge "Disallow system apps to be installed/updated as instant." into rvc-dev am: 35b1a471

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25716297



Change-Id: Iee38deb0acdbe5ecd5af974c7c0709d8c53054f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -13263,6 +13263,9 @@ public class PackageManagerService extends IPackageManager.Stub
                 if (pkgSetting == null) {
                     return PackageManager.INSTALL_FAILED_INVALID_URI;
                 }
+                if (instantApp && (pkgSetting.isSystem() || isUpdatedSystemApp(pkgSetting))) {
+                    return PackageManager.INSTALL_FAILED_INVALID_URI;
+                }
                 if (!canViewInstantApps(callingUid, UserHandle.getUserId(callingUid))) {
                     // only allow the existing package to be used if it's installed as a full
                     // application for at least one user