diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 3f6087b681cbc..4655d09a8b985 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -15003,15 +15003,19 @@ public class PackageManagerService extends IPackageManager.Stub
                         if (disabledPs != null) {
                             dataOwnerPkg = disabledPs.pkg;
                         }
-                        try {
-                            checkDowngrade(dataOwnerPkg, pkgLite);
-                        } catch (PackageManagerException e) {
-                            String errorMsg = "System app: " + packageName
-                                    + " cannot be downgraded to"
-                                    + " older than its preloaded version on the system image. "
-                                    + e.getMessage();
-                            Slog.w(TAG, errorMsg);
-                            return PackageHelper.RECOMMEND_FAILED_VERSION_DOWNGRADE;
+                        if (!Build.IS_DEBUGGABLE && !dataOwnerPkg.isDebuggable()) {
+                            // Only restrict non-debuggable builds and non-debuggable version of
+                            // the app
+                            try {
+                                checkDowngrade(dataOwnerPkg, pkgLite);
+                            } catch (PackageManagerException e) {
+                                String errorMsg = "System app: " + packageName
+                                        + " cannot be downgraded to"
+                                        + " older than its preloaded version on the system image. "
+                                        + e.getMessage();
+                                Slog.w(TAG, errorMsg);
+                                return PackageHelper.RECOMMEND_FAILED_VERSION_DOWNGRADE;
+                            }
                         }
                     }
                 }