Merge "[pm] fail install-existing for apps deleted with KEEP_DATA" into udc-dev am: 5d8b0d27bf am: 867adfb03a

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

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

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

@@ -453,6 +453,7 @@ final class DeletePackageHelper {
                         // We need to set it back to 'installed' so the uninstall
                         // broadcasts will be sent correctly.
                         if (DEBUG_REMOVE) Slog.d(TAG, "Not installed by other users, full delete");
+                        ps.setPkg(null);
                         ps.setInstalled(true, userId);
                         mPm.mSettings.writeKernelMappingLPr(ps);
                         clearPackageStateAndReturn = false;

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

@@ -654,7 +654,7 @@ final class InstallPackageHelper {
             synchronized (mPm.mLock) {
                 final Computer snapshot = mPm.snapshotComputer();
                 pkgSetting = mPm.mSettings.getPackageLPr(packageName);
-                if (pkgSetting == null) {
+                if (pkgSetting == null || pkgSetting.getPkg() == null) {
                     return PackageManager.INSTALL_FAILED_INVALID_URI;
                 }
                 if (!snapshot.canViewInstantApps(callingUid, UserHandle.getUserId(callingUid))) {