Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev

        <activity android:name="SetupChooseLockGeneric"

            android:taskAffinity="com.android.wizard"

            android:theme="@style/SetupWizardDisableAppStartingTheme"

            android:label="@string/lockpassword_choose_lock_generic_header">

            android:label="@string/lock_settings_picker_title">

            <intent-filter>

                <action android:name="com.android.settings.SETUP_LOCK_SCREEN" />

                <category android:name="android.intent.category.DEFAULT" />