Merge "Fix inaccuracy in biometric timeout" am: 2f178de076

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

Change-Id: Icc2581bffaa49e085cc4e70182bab4b799bf7a24