Merge "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro."

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

@@ -78,7 +78,9 @@ public class FingerprintStatusUtils {
      * Returns the class name of the Settings page corresponding to fingerprint settings.
      */
     public String getSettingsClassName() {
-        return FingerprintSettings.class.getName();
+        return !hasEnrolled() && isAvailable()
+            ? FingerprintEnrollIntroductionInternal.class.getName()
+            : FingerprintSettings.class.getName();
     }
 
     /**