Merge "Fixed face enroll intro button issue" into sc-v2-dev

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

@@ -203,11 +203,15 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
                 getMoreButtonTextRes(), this::onNextButtonClick);
         requireScrollMixin.setOnRequireScrollStateChangedListener(
                 scrollNeeded -> {
+
+                    boolean enrollmentCompleted = checkMaxEnrolled() != 0;
+                    if (!enrollmentCompleted) {
                         // Update text of primary button from "More" to "Agree".
                         final int primaryButtonTextRes = scrollNeeded
                                 ? getMoreButtonTextRes()
                                 : getAgreeButtonTextRes();
                         getPrimaryFooterButton().setText(this, primaryButtonTextRes);
+                    }
 
                     // Show secondary button once scroll is completed.
                     if (!scrollNeeded) {