Fix the intent<->activity mapping for wallpaper intent

Change-Id: Iea123dedc1b73c2f5fe7afce6bfc35c6a93481e2
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 01645f2..c846781 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1108,10 +1108,6 @@
                   android:label="@string/wallpaper_settings_fragment_title"
                   android:icon="@drawable/ic_wallpaper"
                   android:exported="true">
-            <intent-filter>
-                <action android:name="android.settings.WALLPAPER_SETTINGS"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.wallpaper.WallpaperTypeSettings" />
             <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
@@ -1124,15 +1120,19 @@
                   android:exported="true"
                   android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
+                <action android:name="android.settings.WALLPAPER_SETTINGS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.suggested.category.PERSONALIZE" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.settings.suggested.category.PERSONALIZE"/>
             </intent-filter>
             <meta-data android:name="com.android.settings.title"
-                       android:resource="@string/wallpaper_suggestion_title" />
+                       android:resource="@string/wallpaper_suggestion_title"/>
             <meta-data android:name="com.android.settings.summary"
                        android:resource="@string/wallpaper_suggestion_summary" />
             <meta-data android:name="com.android.settings.dismiss"