Merge changes Iabb33606,I3c364ebe

* changes:
  Falling back to media session controls.
  Move activity to fullscreen stack when it is relaunched in PIP.

diff --cc core/java/android/app/ITaskStackListener.aidl
Simple merge

diff --cc core/java/android/app/TaskStackListener.java
Simple merge

diff --cc packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
index a2b86d1,a2142a4..49074a6
--- 1/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
--- 2/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
@@@ -150,9 -149,8 +151,9 @@@ public class SystemServicesProxy 
       */
      public abstract static class TaskStackListener {
          public void onTaskStackChanged() { }
 +        public void onTaskSnapshotChanged(int taskId, TaskSnapshot snapshot) { }
          public void onActivityPinned() { }
-         public void onPinnedActivityRestartAttempt() { }
+         public void onPinnedActivityRestartAttempt(ComponentName sourceComponent) { }
          public void onPinnedStackAnimationEnded() { }
          public void onActivityForcedResizable(String packageName, int taskId) { }
          public void onActivityDismissingDockedStack() { }

diff --cc services/core/java/com/android/server/am/TaskChangeNotificationController.java
Simple merge