Merge "Update activity alias for developer settings activity"

                  android:label="@string/development_settings_title"

                  android:targetActivity="Settings$DevelopmentSettingsActivity">

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

                android:value="com.android.settings.DevelopmentSettings" />

                android:value="com.android.settings.development.DevelopmentSettings" />

        </activity-alias>

        <activity android:name=".development.AppPicker"