Merge "Make sure topActivity always retrieves focus when move task to back" into udc-dev

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

@@ -5684,6 +5684,7 @@ class Task extends TaskFragment {
             // Usually resuming a top activity triggers the next app transition, but nothing's got
             // resumed in this case, so we need to execute it explicitly.
             mDisplayContent.executeAppTransition();
+            mDisplayContent.setFocusedApp(topActivity);
         } else {
             mRootWindowContainer.resumeFocusedTasksTopActivities();
         }