Merge "Make FingerprintManager show BiometricPrompt for UDFPS"