Merge "Add auth type to BiometricPrompt.AuthenticationResult"