Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev

am: 174aa3346c

* commit '174aa3346c06341d13f287c72ccd9ec47fce5987':
  Workaround that Recents is shown again after an activity is PIPed

Change-Id: I8a2a7daeebeb37817a36d12e52db86912dce2186

packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java

@@ -413,6 +413,9 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener {
         RecentsConfiguration config = Recents.getConfiguration();
         RecentsActivityLaunchState launchState = config.getLaunchState();
         launchState.reset();
+
+        // Workaround for b/28333917.
+        finish();
     }
 
     @Override