Use separate enroll timeout for fingerprint and face

Currently, we use the same timeout for enrolling any biometric,
including fingerprint and face. This commit requires each type of
biometric to specify its own enrollment timeout and specifically changes
the timeout for face from 60 to 75 seconds.

Test: Multi-angle face enrollment w/ 1-24 buckets captured == 75 seconds
Test: Single-capture face enrollment == 75 seconds
Test: Fingerprint enrollment == 60 seconds

Bug: 137688980
Change-Id: I2735ed4647956c8a4cba573215b551a5c0be6955