Chaning the behavior of settings activity.

> Making all twoState prefs backed by content provider
> Using the stadard intent defined in N for settings
> Using SharedPrefsListener instead of LauncherProvider

Change-Id: I8272f54aa780bc0436e3d0aa89096a4bd2a9194f
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9ae311e..e7b703c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -85,8 +85,11 @@
         <activity
             android:name="com.android.launcher3.SettingsActivity"
             android:label="@string/settings_button_text"
-            android:autoRemoveFromRecents="true"
-            android:process=":settings_process">
+            android:autoRemoveFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
 
         <!-- Intent received used to install shortcuts from other applications -->