Merge "Fix a bug in drop region." into rvc-dev am: aa30a27623 am: 35a365c711

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

Change-Id: Ib7e79684b377b74cca0c681f9955402bc971d5a2

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

@@ -2934,7 +2934,7 @@ class Task extends WindowContainer<WindowContainer> {
             final Task rootTask = getRootTask();
             final Task topNonOrgTask =
                     rootTask.mCreatedByOrganizer ? rootTask.getTopMostTask() : rootTask;
-            if (isDescendantOf(topNonOrgTask)) {
+            if (this == topNonOrgTask || isDescendantOf(topNonOrgTask)) {
                 return false;
             }
         }