Merge changes from topic "presubmit-am-86d37df06f3b4cba87f03386fed73973" into sc-qpr1-dev

* changes:
  [automerge] [pm] forbid deletion of protected packages 2p: dba7ceb57e
  [pm] forbid deletion of protected packages

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

@@ -21359,6 +21359,20 @@ public class PackageManagerService extends IPackageManager.Stub
 
         final String packageName = versionedPackage.getPackageName();
         final long versionCode = versionedPackage.getLongVersionCode();
+
+        if (mProtectedPackages.isPackageStateProtected(userId, packageName)) {
+            mHandler.post(() -> {
+                try {
+                    Slog.w(TAG, "Attempted to delete protected package: " + packageName);
+                    observer.onPackageDeleted(packageName,
+                            PackageManager.DELETE_FAILED_INTERNAL_ERROR, null);
+                } catch (RemoteException re) {
+                }
+            });
+            return;
+        }
+
+
         final String internalPackageName;
 
         try {