Merge "Apply personal filter when private tab not shown" into main

src/com/android/settings/applications/manageapplications/ManageApplications.java

@@ -667,7 +667,11 @@ public class ManageApplications extends InstrumentedFragment
             compositeFilter =
                     new CompoundFilter(compositeFilter, ApplicationsState.FILTER_PRIVATE_PROFILE);
         }
-        if (mIsPersonalOnly) {
+
+        // We might not be showing the private tab even when there's a private profile present and
+        // there's only personal profile info to show, in which case we should still apply the
+        // personal filter.
+        if (mIsPersonalOnly || !(mIsWorkOnly || mIsPrivateProfileOnly)) {
             compositeFilter = new CompoundFilter(compositeFilter,
                     ApplicationsState.FILTER_PERSONAL);
         }