Merge "Revert "Add the FLAG_IMMUTABLE flag for creating a PendingIntent""