Merge "Fix the leak while remove the taskFragment" into sc-v2-dev am: e1fdf43e2a am: 94cb943a53

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

Change-Id: Ib5af896aa83702c1a10e466daec10bd0bf2375f3

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

@@ -116,8 +116,11 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr
         }
 
         void dispose() {
-            mOrganizedTaskFragments.forEach(TaskFragment::removeImmediately);
-            mOrganizedTaskFragments.clear();
+            while (!mOrganizedTaskFragments.isEmpty()) {
+                final TaskFragment taskFragment = mOrganizedTaskFragments.get(0);
+                taskFragment.removeImmediately();
+                mOrganizedTaskFragments.remove(taskFragment);
+            }
             mOrganizer.asBinder().unlinkToDeath(this, 0 /*flags*/);
         }