Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa26 am: 37f74d4aab

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

Change-Id: Ie9f7fbf6de904e3002772c6e2cb004f1f9099035

AndroidManifest.xml

@@ -1911,7 +1911,6 @@
         </activity>
 
         <activity android:name=".password.SetupChooseLockGeneric$InternalActivity"
-            android:theme="@style/GlifTheme.Light"
             android:exported="false"
             android:excludeFromRecents="true" />
 

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

@@ -134,6 +134,8 @@ public class SetNewPasswordActivity extends Activity implements SetNewPasswordCo
             intent.putExtra(EXTRA_KEY_IS_CALLING_APP_ADMIN, true);
         }
         intent.putExtra(EXTRA_KEY_DEVICE_PASSWORD_REQUIREMENT_ONLY, mDevicePasswordRequirementOnly);
+        // Copy the setup wizard intent extra to the intent.
+        WizardManagerHelper.copyWizardManagerExtras(getIntent(), intent);
         startActivity(intent);
         finish();
     }