Merge "Change deleteRootTasks so that it returns false instead of exception" into sc-dev am: 4423456dd9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b658f7eb05e5b1e923126b276f86b1bf4fdc6ea

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

@@ -596,9 +596,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub {
         try {
             synchronized (mGlobalLock) {
                 final WindowContainer wc = WindowContainer.fromBinder(token.asBinder());
-                if (wc == null) {
-                    throw new IllegalArgumentException("Can't resolve window from token");
-                }
+                if (wc == null) return false;
                 final Task task = wc.asTask();
                 if (task == null) return false;
                 if (!task.mCreatedByOrganizer) {