b/2483233 Made each reminder time a unique intent

Snoozing alarms was causing a leapfrog effect which would drop the
alert in the middle because of PendingIntent. By making each intent
unique to a given time this will no longer occur.

Change-Id: I6ca6821f7f8879a299775f4fca4e2ad0de55f1bc
diff --git a/core/java/android/provider/Calendar.java b/core/java/android/provider/Calendar.java
index 1c5fca3..ba63a66 100644
--- a/core/java/android/provider/Calendar.java
+++ b/core/java/android/provider/Calendar.java
@@ -1279,9 +1279,9 @@
             }
 
             Intent intent = new Intent(EVENT_REMINDER_ACTION);
+            intent.setData(ContentUris.withAppendedId(Calendar.CONTENT_URI, alarmTime));
             intent.putExtra(ALARM_TIME, alarmTime);
-            PendingIntent pi = PendingIntent.getBroadcast(context, 0, intent,
-                    PendingIntent.FLAG_CANCEL_CURRENT);
+            PendingIntent pi = PendingIntent.getBroadcast(context, 0, intent, 0);
             manager.set(AlarmManager.RTC_WAKEUP, alarmTime, pi);
         }