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

author Selim Cinek <cinek@google.com>

Wed, 7 Jun 2017 18:13:25 +0000 (18:13 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 7 Jun 2017 18:13:35 +0000 (18:13 +0000)
author Selim Cinek <cinek@google.com>
Wed, 7 Jun 2017 18:13:25 +0000 (18:13 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 7 Jun 2017 18:13:35 +0000 (18:13 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge
author	Selim Cinek <cinek@google.com>
	Wed, 7 Jun 2017 18:13:25 +0000 (18:13 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 7 Jun 2017 18:13:35 +0000 (18:13 +0000)