Stop marking apps as privileged if they are not signed properly.

Fixes: 311374917
Test: atest android.content.pm.cts.PackageManagerTest
(cherry picked from commit 3ee5dfd)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:06775341ad7d77410798f95117cbee7a1a02c201)
Merged-In: I5b5b81cf43b06837a22c8dfd170a112106dd64c1
Change-Id: I5b5b81cf43b06837a22c8dfd170a112106dd64c1

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

@@ -4614,7 +4614,9 @@ private void assertOverlayIsValid(AndroidPackage pkg,
 
     private void assertPackageWithSharedUserIdIsPrivileged(AndroidPackage pkg)
             throws PackageManagerException {
-        if (!AndroidPackageLegacyUtils.isPrivileged(pkg) && (pkg.getSharedUserId() != null)) {
+        if (!AndroidPackageLegacyUtils.isPrivileged(pkg)
+                && (pkg.getSharedUserId() != null)
+                && !pkg.isLeavingSharedUser()) {
             SharedUserSetting sharedUserSetting = null;
             try {
                 synchronized (mPm.mLock) {
@@ -4654,7 +4656,8 @@ private void assertPackageWithSharedUserIdIsPrivileged(AndroidPackage pkg)
         if (((scanFlags & SCAN_AS_PRIVILEGED) == 0)
                 && !AndroidPackageLegacyUtils.isPrivileged(pkg)
                 && (pkg.getSharedUserId() != null)
-                && !skipVendorPrivilegeScan) {
+                && !skipVendorPrivilegeScan
+                && !pkg.isLeavingSharedUser()) {
             SharedUserSetting sharedUserSetting = null;
             synchronized (mPm.mLock) {
                 try {