Merge "Add null checks in BiometricPromptService"