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

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

Change-Id: I3d3c33075f1a09acb05f7c4b1a209bb8eac3b855