Merge "Show fingerprint icon when face fails on BiometricPrompt" into sc-dev am: a69ceda9 am: fb9d4311 am: a0bf2bcf am: 70b1856b

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

Change-Id: I7b0c2e5fbb358bd2e59a62c5c771066ddd0c6a2f