Merge "Skip adding tasks to the skip list if they won't be processed" into sc-v2-dev

services/core/java/com/android/server/wm/TaskSnapshotController.java

@@ -168,6 +168,9 @@ class TaskSnapshotController {
      */
     @VisibleForTesting
     void addSkipClosingAppSnapshotTasks(ArraySet<Task> tasks) {
+        if (shouldDisableSnapshots()) {
+            return;
+        }
         mSkipClosingAppSnapshotTasks.addAll(tasks);
     }