Merge "Remove WifiSetupActivity"

                android:value="true" />

        </activity>

        <activity android:name=".wifi.WifiSetupActivity"

                android:taskAffinity="com.android.wizard"

                android:theme="@style/SetupWizardDisableAppStartingTheme"

                android:label="@string/wifi_setup_wizard_title"

                android:icon="@drawable/empty_icon"

                android:clearTaskOnLaunch="true"

                android:windowSoftInputMode="adjustNothing">

            <intent-filter android:priority="1">

                <action android:name="com.android.net.wifi.SETUP_WIFI_NETWORK" />

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

            </intent-filter>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>

        <activity android:name="Settings$AdvancedWifiSettingsActivity"

                android:taskAffinity="com.android.settings"

                android:label="@string/wifi_advanced_settings_label"