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

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

Change-Id: I5b3291aba3ffbf4d842127fc6655dba81a2cab91