Merge "PIP: Fix NPE when onboarding is shown" into nyc-dev

packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java

@@ -323,6 +323,7 @@ public class SystemServicesProxy {
             // Remove the task if it is blacklisted
             if (sRecentsBlacklist.contains(t.realActivity.getClassName())) {
                 iter.remove();
+                continue;
             }
 
             // Remove the task if it is marked as excluded, unless it is the first most task and we
@@ -332,6 +333,7 @@ public class SystemServicesProxy {
             isExcluded |= quietProfileIds.contains(t.userId);
             if (isExcluded && (!isFirstValidTask || !includeFrontMostExcludedTask)) {
                 iter.remove();
+                continue;
             }
 
             isFirstValidTask = false;