Modified Fp -> Face setup flow

Test: Skip FP, Enroll Face, hit back button, observe that you will go
back to Fingerprint enrollment.
Test: Verify that after completing a biometric enroll we no longer
show the introduction activity with a "Done" button.
Fixes: 229813512

Change-Id: Ie0d7ce5d5cef084b3614afce10e05dc72c86b492

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java

@@ -289,6 +289,17 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        boolean enrolledFingerprint = false;
+        if (data != null) {
+            enrolledFingerprint = data.getBooleanExtra(EXTRA_FINISHED_ENROLL_FINGERPRINT, false);
+        }
+
+        if (resultCode == RESULT_CANCELED && enrolledFingerprint) {
+            setResult(resultCode, data);
+            finish();
+            return;
+        }
+
         if (requestCode == CONFIRM_REQUEST) {
             if (resultCode == RESULT_OK && data != null) {
                 throw new IllegalStateException("Pretty sure this is dead code");