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: If357b7a14191a8691f0f04f43becbc3d5397725e