Merge "Exclude transient activity from hide-tasks" into udc-dev am: 316bb2566e

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

Change-Id: I7d41a7c33c8501d3e9cc557d22e6cefadd8b8c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -278,13 +278,14 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
         setTransientLaunchToChanges(activity);
 
         if (restoreBelow != null) {
+            final Task transientRootTask = activity.getRootTask();
             // Collect all visible activities which can be occluded by the transient activity to
             // make sure they are in the participants so their visibilities can be updated when
             // finishing transition.
             ((WindowContainer<?>) restoreBelow.getParent()).forAllTasks(t -> {
                 if (t.isVisibleRequested() && !t.isAlwaysOnTop()
                         && !t.getWindowConfiguration().tasksAreFloating()) {
-                    if (t.isRootTask()) {
+                    if (t.isRootTask() && t != transientRootTask) {
                         mTransientHideTasks.add(t);
                     }
                     if (t.isLeafTask()) {