Merge "Fix biometric tests that relied on a non-zero error reset delay." into...

Merge "Fix biometric tests that relied on a non-zero error reset delay." into sc-dev am: 72104bdf am: 3134c919 am: aa54db0f

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

Change-Id: I1df28bf93734211cc78091a3e9b817d96e75b124