Merge "Fix inaccuracy in biometric timeout" am: 2f178de076 am: cf3c838d6d am: 27f0879140 am: ed6844ea22 am: 02dada3a31
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991781 Change-Id: I432490110d00402be727e18f4cb83326051e9c8e
This commit is contained in: