Fix malformed CtsTestStubs manifest entries.

The <action> and other elements must be enclosed within an
Intent filter, otherwise they are ignored by the system
and messages like the following are printed to the log:

01-10 01:44:16.132 W/PackageParser(  195): Problem in package
    /data/app/vmdl-1512176943.tmp:
01-10 01:44:16.132 W/PackageParser(  195): Unknown element under
    <activity>: category at /data/app/vmdl-1512176943.tmp Binary XML
    file line #765

Change-Id: I100acc5df504010ea483c78a83a481955d989956
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 279ddb4..9dcb859 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -507,14 +507,18 @@
 
         <activity android:name="android.widget.cts.GalleryStubActivity"
             android:label="GalleryStubActivity">
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
         </activity>
 
         <activity android:name="android.widget.cts.MockPopupWindowStubActivity"
             android:label="MockPopupWindowStubActivity">
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+            </intent-filter>
         </activity>
 
        <activity android:name="android.media.cts.FaceDetectorStub"
@@ -650,9 +654,11 @@
 
         <activity android:name="android.app.cts.InstrumentationTestActivity"
             android:label="InstrumentationTestActivity">
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <data android:mimeType="vnd.android.cursor.dir/person" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.cursor.dir/person" />
+            </intent-filter>
         </activity>
 
         <activity android:name="android.app.cts.AliasActivityStub">
@@ -761,8 +767,10 @@
 
         <activity android:name="android.view.cts.FocusFinderStubActivity"
             android:label="FocusFinderStubActivity">
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.DEFAULT" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
 
         <activity android:name="android.view.cts.GestureDetectorStubActivity"