Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev

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

@@ -18529,16 +18529,6 @@ public class PackageManagerService extends IPackageManager.Stub
                 return PackageManager.DELETE_FAILED_INTERNAL_ERROR;
             }
 
-            if (isSystemApp(uninstalledPs)) {
-                UserInfo userInfo = mUserManager.getUserInfo(userId);
-                if (userInfo == null || !userInfo.isAdmin()) {
-                    Slog.w(TAG, "Not removing package " + packageName
-                            + " as only admin user may downgrade system apps");
-                    EventLog.writeEvent(0x534e4554, "170646036", -1, packageName);
-                    return PackageManager.DELETE_FAILED_USER_RESTRICTED;
-                }
-            }
-
             disabledSystemPs = mSettings.getDisabledSystemPkgLPr(packageName);
             // Save the enabled state before we delete the package. When deleting a stub
             // application we always set the enabled state to 'disabled'.