Merge "Show fingerprint icon when face fails on BiometricPrompt" into sc-dev am: a69ceda9c4 am: 38d75fdf31 am: 5d4d509fb1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15504270

Change-Id: I4d0c065195c7c54a16112513f392de6df9c810e0