Merge "Rollbacks shouldn't be removed when it session expires (1/n)" into sc-dev am: a603b6bfce

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

Change-Id: I705448281abb9da90d6f4d13d17b0e04ce72280f

services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java

@@ -613,9 +613,11 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub implements Rollba
                 PackageInstaller.SessionInfo session = mContext.getPackageManager()
                         .getPackageInstaller().getSessionInfo(rollback.getStagedSessionId());
                 if (session == null || session.isStagedSessionFailed()) {
-                    iter.remove();
-                    deleteRollback(rollback,
-                            "Session " + rollback.getStagedSessionId() + " not existed or failed");
+                    if (rollback.isEnabling()) {
+                        iter.remove();
+                        deleteRollback(rollback, "Session " + rollback.getStagedSessionId()
+                                + " not existed or failed");
+                    }
                     continue;
                 }