Merge "Show fingerprint icon when face fails on BiometricPrompt" into sc-dev