Merge "Show fingerprint icon when face fails on BiometricPrompt" into sc-dev am: a69ceda9 am: 38d75fdf am: a123b82d am: c3c7b844

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

Change-Id: I771b887b0bca5562465df1f2f70f0299492bfaa1