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

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

Change-Id: I3e9addc905cbe722a66006900f152006df160bb8