am b728c072: am ab4b6c42: Add replace flag to a few more broadcasts.

Merge commit 'b728c072e98ee560dc97744c85d914bd550a8a43'

* commit 'b728c072e98ee560dc97744c85d914bd550a8a43':
  Add replace flag to a few more broadcasts.

policy/com/android/internal/policy/impl/GlobalActions.java

@@ -548,6 +548,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
                 Settings.System.AIRPLANE_MODE_ON,
                 on ? 1 : 0);
         Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
+        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);
         intent.putExtra("state", on);
         mContext.sendBroadcast(intent);
     }

policy/com/android/internal/policy/impl/KeyguardViewMediator.java

@@ -267,6 +267,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
                 mKeyguardViewProperties, mUpdateMonitor);
 
         mUserPresentIntent = new Intent(Intent.ACTION_USER_PRESENT);
+        mUserPresentIntent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);
     }
 
     /**