Merge "Biometric time-based resetLockout for multi-biometric devices" into sc-dev am: f8ec6f38 am: 6303bb31

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

Change-Id: Ic17cf5725fbaa4a15273089cfbb7c9f6de74aa32