Removing ContactSearchActivity and SearchResultsActivity

Bug: 3124910
Change-Id: Iad3c19262b22fb2345bbff42707e1a4d186c0a62
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cbff3ae..f8fccae 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -242,6 +242,13 @@
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
                 <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.cursor.dir/contact" android:host="com.android.contacts" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="com.android.contacts.action.FILTER_CONTACTS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.cursor.dir/contact" android:host="com.android.contacts" />
             </intent-filter>
 
             <meta-data android:name="android.app.searchable"
@@ -311,24 +318,6 @@
             </intent-filter>
         </activity>
 
-        <!-- The contacts search/filter UI -->
-        <activity android:name=".activities.ContactSearchActivity"
-            android:theme="@style/ContactsSearchTheme"
-            android:windowSoftInputMode="stateAlwaysVisible"
-        >
-            <intent-filter>
-                <action android:name="com.android.contacts.action.FILTER_CONTACTS" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.dir/contact" android:host="com.android.contacts" />
-            </intent-filter>
-
-        </activity>
-
-        <!-- The contacts search/filter UI -->
-        <activity-alias android:name="SearchResultsActivity"
-            android:targetActivity=".activities.ContactBrowserActivity">
-        </activity-alias>
-
         <!-- Used to set options -->
         <activity
             android:name=".preference.ContactsPreferenceActivity"