Merge "Fix crash in settings"

        <!-- Note this must not be exported since it returns the password in the intent -->

        <activity android:name="ConfirmLockPattern$InternalActivity"

            android:exported="false"/>

            android:exported="false"

            android:theme="@style/Theme.ConfirmDeviceCredentials"/>

        <!-- Note this must not be exported since it returns the password in the intent -->

        <activity android:name="ConfirmLockPassword$InternalActivity"

            android:exported="false"

            android:windowSoftInputMode="stateVisible|adjustResize"/>

            android:windowSoftInputMode="stateVisible|adjustResize"

            android:theme="@style/Theme.ConfirmDeviceCredentials"/>

        <activity android:name="SetupChooseLockGeneric"

            android:taskAffinity="com.android.wizard"