Merge "Update BiometricPrompt API naming"