Merge "Updating code due to TaskStackChangeListener changes" into tm-dev

quickstep/src/com/android/quickstep/RecentsModel.java

@@ -54,7 +54,7 @@ import java.util.function.Consumer;
  * Singleton class to load and manage recents model.
  */
 @TargetApi(Build.VERSION_CODES.O)
-public class RecentsModel extends TaskStackChangeListener implements IconChangeListener {
+public class RecentsModel implements IconChangeListener, TaskStackChangeListener {
 
     // We do not need any synchronization for this variable as its only written on UI thread.
     public static final MainThreadInitializedObject<RecentsModel> INSTANCE =

quickstep/src/com/android/quickstep/RotationTouchHelper.java

@@ -74,7 +74,6 @@ public class RotationTouchHelper implements DisplayInfoChangeListener {
 
         @Override
         public void onActivityRotation(int displayId) {
-            super.onActivityRotation(displayId);
             // This always gets called before onDisplayInfoChanged() so we know how to process
             // the rotation in that method. This is done to avoid having a race condition between
             // the sensor readings and onDisplayInfoChanged() call