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

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

Change-Id: I9bc3faec17629a340e54aa2099a0eed423dc47ea