Merge "Change launch method for preference Display->Ambient Display." into nyc-mr1-dev

        <PreferenceScreen

                android:key="doze"

                android:title="@string/doze_title"

                android:summary="@string/doze_summary"

                android:fragment="com.android.settings.gestures.GestureSettings" >

                android:summary="@string/doze_summary" >

                <extra android:name="gesture_scroll_to_preference"

                       android:value="gesture_pick_up_and_nudge" />

                <intent

                    android:targetPackage="com.android.settings"

                    android:targetClass="com.android.settings.Settings$GestureSettingsActivity" >

                    <extra android:name="show_drawer_menu"

                           android:value="true" />

                </intent>

        </PreferenceScreen>

        <SwitchPreference