Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501 am: fd115c5db2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178

Change-Id: I7b3af9b3a11572706110082206b7ec56883b06ce

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

@@ -284,7 +284,7 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
             launchCredentialOnlyEnroll();
             finish();
         } else if (canUseFace && canUseFingerprint) {
-            if (mParentalOptionsRequired && mGkPwHandle != null) {
+            if (mGkPwHandle != null) {
                 launchFaceAndFingerprintEnroll();
             } else {
                 setOrConfirmCredentialsNow();