Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Work on issue #25467052: System lagged out

Change-Id: Ib124a6cd741e7f101f371c07b3002b1e1262ba56
diff --git a/src/com/android/providers/calendar/CalendarProvider2.java b/src/com/android/providers/calendar/CalendarProvider2.java
index 888600e..d51480a 100644
--- a/src/com/android/providers/calendar/CalendarProvider2.java
+++ b/src/com/android/providers/calendar/CalendarProvider2.java
@@ -4584,6 +4584,7 @@
     private void doSendUpdateNotification() {
         Intent intent = new Intent(Intent.ACTION_PROVIDER_CHANGED,
                 CalendarContract.CONTENT_URI);
+        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);
         if (Log.isLoggable(TAG, Log.INFO)) {
             Log.i(TAG, "Sending notification intent: " + intent);
         }