DO NOT MERGE Add ability to specify video state through TestInCallService intent.

TestInCallService has an "ACTION_SEND_UPGRADE_REQUEST_FROM_TEST_INCALL_SERVICE"
intent.
Added support to specify an int videoState as part of the intent so that
the caller can test sending video requests that our InCall may not
support (e.g. incoming 1-way request when in audio-only).

Bug: 20090022
Change-Id: I283575cc296444bbdadcdec5c1caa1593c1eed3b
diff --git a/testapps/AndroidManifest.xml b/testapps/AndroidManifest.xml
index 231bff6..bbe0243 100644
--- a/testapps/AndroidManifest.xml
+++ b/testapps/AndroidManifest.xml
@@ -59,6 +59,7 @@
                  android:process="com.android.server.telecom.testapps.TestInCallService" >
             <intent-filter>
                 <action android:name="android.server.telecom.testapps.ACTION_SEND_UPDATE_REQUEST_FROM_TEST_INCALL_SERVICE"/>
+                <data android:scheme="int" />
             </intent-filter>
         </receiver>
 
@@ -86,10 +87,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="int" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.server.telecom.testapps.ACTION_SEND_UPDATE_REQUEST_FROM_TEST_INCALL_SERVICE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
         </activity>
 
         <receiver android:name="com.android.server.telecom.testapps.CallNotificationReceiver"