Merge "Make biometric PendingIntent immutable"