Fix scroll issue when going from Display->Ambient Display to Moves.

Move the scroll-to extra param to inside the launch intent of the doze
preference screen for it to take effect. The original extra param is
added to the preference screen itself as we were defining the fragment
to launch previously.

Change-Id: Id3e8cfbe61b46be2a5945da7e531f1a3c8b1454f
Fixes: 30262357
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index a3305a2..a89d687 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -82,13 +82,13 @@
                 android:key="doze"
                 android:title="@string/doze_title"
                 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" />
+                    <extra android:name="gesture_scroll_to_preference"
+                           android:value="gesture_pick_up_and_nudge" />
                 </intent>
         </PreferenceScreen>