Merge "Temporarily disable active task trimming."

services/core/java/com/android/server/am/ActivityStackSupervisor.java

@@ -3005,12 +3005,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
 
     @Override
     public void onRecentTaskRemoved(TaskRecord task, boolean wasTrimmed) {
-        if (wasTrimmed) {
-            // Task was trimmed from the recent tasks list -- remove the active task record as well
-            // since the user won't really be able to go back to it
-            removeTaskByIdLocked(task.taskId, false /* killProcess */,
-                    false /* removeFromRecents */);
-        }
+        // TODO: Trim active task once b/68045330 is fixed
         task.removedFromRecents();
     }