Merge "Revert "Specify explicitly FLAG_IMMUTABLE for PendingIntent""