Merge "Fix multiple biometrics enrollment flow" into sc-dev

src/com/android/settings/biometrics/face/FaceEnrollEducation.java

@@ -215,9 +215,11 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
     }
 
     protected void onSkipButtonClick(View view) {
+        if (!BiometricUtils.tryStartingNextBiometricEnroll(this, ENROLL_NEXT_BIOMETRIC_REQUEST)) {
             setResult(RESULT_SKIP);
             finish();
         }
+    }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {