Move OtaspTestActivity into the "tests" package

Move it into com.android.phone.tests, which is the right place for random
test activities that are related to the phone app, but shouldn't be
installed by default.

Bug: 3040809
Change-Id: I3da2d8387ba2c79dbd6caa64fe49c6cdff665fdd
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 652945e..725f696 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -18,6 +18,7 @@
     package="com.android.phone.tests">
 
     <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.PERFORM_CDMA_PROVISIONING" />
 
     <application android:label="@string/app_name">
         <uses-library android:name="android.test.runner" />
@@ -37,6 +38,16 @@
             </intent-filter>
         </activity>
 
+        <!-- Test activity mimicking the PERFORM_CDMA_PROVISIONING behavior of
+             SetupWizard, useful for testing "non-interactive" OTASP. -->
+        <activity android:name="OtaspTestActivity"
+                  android:label="OtaspTest">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
     </application>
 
     <!--