Merge changes from topic "am-1d52319f-a897-430b-addc-cdeb570f8e89-ub-launcher3-edmonton-polish" into ub-launcher3-master

* changes:
  [automerger] Report when a notification is shown in the popup am: c97d846372
  Report when a notification is shown in the popup

src/com/android/launcher3/notification/NotificationMainView.java

@@ -116,6 +116,10 @@ public class NotificationMainView extends FrameLayout implements SwipeDetector.L
      */
     public void applyNotificationInfo(NotificationInfo mainNotification, boolean animate) {
         mNotificationInfo = mainNotification;
+        NotificationListener listener = NotificationListener.getInstanceIfConnected();
+        if (listener != null) {
+            listener.setNotificationsShown(new String[] {mNotificationInfo.notificationKey});
+        }
         CharSequence title = mNotificationInfo.title;
         CharSequence text = mNotificationInfo.text;
         if (!TextUtils.isEmpty(title) && !TextUtils.isEmpty(text)) {