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

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

Change-Id: I96f18a7eec73dfc63d05f5c220ff207662d193fd