Merge "Prevent multi-sensor enrollment from doing nothing." into sc-dev am: 0842cc9adc am: 4fbf1990bf

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

Change-Id: I02630a93f9cba60dc7368dca2a819c24903225ee

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

@@ -271,7 +271,7 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
         mIsFingerprintEnrollable = fingerprintManager.getEnrolledFingerprints(mUserId).size()
                 < fpProperties.get(0).maxEnrollmentsPerUser;
 
-        if (!mConfirmingCredentials && mGkPwHandle == null) {
+        if (!mConfirmingCredentials) {
             mConfirmingCredentials = true;
             if (!userHasPassword(mUserId)) {
                 launchChooseLock();