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

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

Change-Id: I0285f3c0579a0886f1d74647f0f6cba2c676b25e