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
diff --git a/services/core/java/com/android/server/biometrics/face/FaceService.java b/services/core/java/com/android/server/biometrics/face/FaceService.java
index a38abdc..c26e53f 100644
--- a/services/core/java/com/android/server/biometrics/face/FaceService.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceService.java
@@ -329,6 +329,7 @@
      * Receives the incoming binder calls from FaceManager.
      */
     private final class FaceServiceWrapper extends IFaceService.Stub {
+        private static final int ENROLL_TIMEOUT_SEC = 75;
 
         /**
          * The following methods contain common code which is shared in biometrics/common.
@@ -368,7 +369,8 @@
             final boolean restricted = isRestricted();
             final EnrollClientImpl client = new EnrollClientImpl(getContext(), mDaemonWrapper,
                     mHalDeviceId, token, new ServiceListenerImpl(receiver), mCurrentUserId,
-                    0 /* groupId */, cryptoToken, restricted, opPackageName, disabledFeatures) {
+                    0 /* groupId */, cryptoToken, restricted, opPackageName, disabledFeatures,
+                    ENROLL_TIMEOUT_SEC) {
 
                 @Override
                 public int[] getAcquireIgnorelist() {