Merge "Allow users to create shortcuts to the VPN settings on the Home Screen."

        </activity>

        <activity android:name=".vpn.VpnSettings"

                android:label="@string/vpn_settings_title"

                android:configChanges="orientation|keyboardHidden"

                android:clearTaskOnLaunch="true">

            <intent-filter>

                <action android:name="android.net.vpn.SETTINGS" />

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

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

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

        </activity>