Merge "Ensure the notification is removed when bubble is removed & fix cancel all...

author Mady Mellor <madym@google.com>

Fri, 3 May 2019 17:06:39 +0000 (17:06 +0000)

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

Fri, 3 May 2019 17:06:39 +0000 (17:06 +0000)
author Mady Mellor <madym@google.com>
Fri, 3 May 2019 17:06:39 +0000 (17:06 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 3 May 2019 17:06:39 +0000 (17:06 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
Simple merge
author	Mady Mellor <madym@google.com>
	Fri, 3 May 2019 17:06:39 +0000 (17:06 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 3 May 2019 17:06:39 +0000 (17:06 +0000)