Merge "Fix NPE crashes during UDFPS BiometricPrompt" into sc-dev