am df9e20f2: Merge changes Iffd15e95,Id2db95ec

* commit 'df9e20f28839a61dd487c2a67f914e87da1dede9':
  Log notification clicks
  Add userId to StatusBarNotification key

core/java/android/service/notification/StatusBarNotification.java

@@ -87,7 +87,7 @@ public class StatusBarNotification implements Parcelable {
     }
 
     private String key() {
-        return pkg + '|' + id + '|' + tag + '|' + uid;
+        return user.getIdentifier() + "|" + pkg + "|" + id + "|" + tag + "|" + uid;
     }
 
     public void writeToParcel(Parcel out, int flags) {