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: bb34e046 am: 8dc57fc7

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

Change-Id: I10bd59813ab4ae0f040f6d6aa0605fdfd8e43cfa