Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

@@ -6121,6 +6121,9 @@ public class StatusBar extends SystemUI implements DemoMode,
     }
 
     public boolean isLockscreenPublicMode(int userId) {
+        if (userId == UserHandle.USER_ALL) {
+            return mLockscreenPublicMode.get(mCurrentUserId, false);
+        }
         return mLockscreenPublicMode.get(userId, false);
     }