Merge "Improve BiometricPrompt support for face + UDFPS" into sc-dev