Change to show generic lock screen before setup fingerprint or face

Bug: 121235656
Test: atest
Change-Id: Ib2a4c7382334433a56225f5338896f70b752071d

src/com/android/settings/password/SetupChooseLockPassword.java

@@ -131,6 +131,13 @@ public class SetupChooseLockPassword extends ChooseLockPassword {
             startChooseLockActivity(lock, getActivity());
         }
 
+        @Override
+        protected int getStageType() {
+            // Return TYPE_NONE to make generic lock screen launch in Setup wizard flow before
+            // fingerprint and face setup.
+            return Stage.TYPE_NONE;
+        }
+
         @Override
         protected void updateUi() {
             super.updateUi();