Merge "Drop PendingIntent extras from external packages during enrollment." into main