Remove multi-biometric interstitial screen in SUW

On devices with multiple biometric sensors, this removes the
interstitial screen in Setup Wizard that let the user choose whether to
enroll face, fingerprint, or both. Instead, such devices will always
show face enrollment followed by fingerprint, with the option to skip
either or both.

Test: Manually tested all enroll/skip combinations in SUW

Fixes: 183720580
Change-Id: I7f045579f732196bde28dd96e9443e4bb4c906ae

src/com/android/settings/biometrics/BiometricUtils.java

@@ -30,6 +30,7 @@ import android.view.Surface;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
@@ -181,7 +182,7 @@ public class BiometricUtils {
      * @param hardwareAuthToken HardwareAuthToken from Gatekeeper
      * @param userId User to request enrollment for
      */
-    public static void launchEnrollForResult(@NonNull BiometricEnrollActivity activity,
+    public static void launchEnrollForResult(@NonNull FragmentActivity activity,
             @NonNull Intent intent, int requestCode,
             @Nullable byte[] hardwareAuthToken, @Nullable Long gkPwHandle, int userId) {
         if (hardwareAuthToken != null) {