Merge "Removing notifications that were kept around longer on click" into pi-dev

author Selim Cinek <cinek@google.com>

Thu, 17 May 2018 01:35:27 +0000 (01:35 +0000)

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

Thu, 17 May 2018 01:35:27 +0000 (01:35 +0000)
author Selim Cinek <cinek@google.com>
Thu, 17 May 2018 01:35:27 +0000 (01:35 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 17 May 2018 01:35:27 +0000 (01:35 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge
author	Selim Cinek <cinek@google.com>
	Thu, 17 May 2018 01:35:27 +0000 (01:35 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 17 May 2018 01:35:27 +0000 (01:35 +0000)