Merge "Update BiometricPrompt API annotations and comments"