Suppress VideoVideoTest#testOnKeyDown

Bug 3486016

The test fails when it is run with testGetDuration. Even though the test
tears down the activity there seems to be some state within VideoView
that causes testOnKeyDown to fail. Update the expectations for now
and rename the expectations file.

Change-Id: Ifce6e83813d3f3abdb555e88a8361af7d6225e7a
diff --git a/tests/expectations/knownfailures-2.3_r1.txt b/tests/expectations/knownfailures.txt
similarity index 90%
rename from tests/expectations/knownfailures-2.3_r1.txt
rename to tests/expectations/knownfailures.txt
index 2be2078..983e979 100644
--- a/tests/expectations/knownfailures-2.3_r1.txt
+++ b/tests/expectations/knownfailures.txt
@@ -6,6 +6,11 @@
 { name: "android.webkit.cts.WebSettingsTest#testSetAppCacheEnabled" },
 { name: "android.net.cts.SSLCertificateSocketFactoryTest" },
 
+{
+  description: "testGetDuration causes testOnKeyDown to fail for some reason",
+  name: "android.widget.cts.VideoViewTest#testOnKeyDown"
+},
+
 /* These tests pass when executed individually but fail when running CTS as a whole on GRH78. */
 {
   name: "org.apache.harmony.luni.tests.internal.net.www.protocol.https.HttpsURLConnectionTest#testProxyConnection",