Merge "Fix inability to dismiss Assistant answer when launcher frontmost" into ub-launcher3-qt-r1-dev am: 290a9a814a

am: c714f1657b

Change-Id: I7c227379a4f429c8f73828782f64bfd89fb90eec

quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java

@@ -657,10 +657,12 @@ public class TouchInteractionService extends Service implements
             // In the case where we are in the excluded assistant state, ignore it and treat the
             // running activity as the task behind the assistant
             runningTaskInfo = mAM.getRunningTask(ACTIVITY_TYPE_ASSISTANT);
-            final ComponentName homeComponent =
+            if (!ActivityManagerWrapper.isHomeTask(runningTaskInfo)) {
+                final ComponentName homeComponent =
                     mOverviewComponentObserver.getHomeIntent().getComponent();
-            forceOverviewInputConsumer =
+                forceOverviewInputConsumer =
                     runningTaskInfo.baseIntent.getComponent().equals(homeComponent);
+            }
         }
 
         if (runningTaskInfo == null && !sSwipeSharedState.goingToLauncher