Disable layout eme test on all devices

Bug: 607350
Change-Id: I5f936eec76511e5f9956aad1917eb823f79120fa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1630031Reviewed-by: Changwan Ryu <changwan@chromium.org>
Commit-Queue: Andrew Luo <aluo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663837}

android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java

@@ -22,7 +22,6 @@ import org.junit.runner.RunWith;
 import org.chromium.base.Log;
 import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.DisableIf;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.webview_shell.WebViewLayoutTestActivity;
@@ -303,18 +302,18 @@ public class WebViewLayoutTest {
     }
 
     /*
-    currently failing on aosp bots, see crbug.com/607350
+    TODO(aluo): Investigate why this is failing on google devices too and not
+    just aosp per crbug.com/607350
     */
     @Test
     @MediumTest
-    @DisableIf.Build(product_name_includes = "aosp")
+    @DisabledTest(message = "crbug.com/607350")
     public void testEMEPermission() throws Exception {
         mTestActivity.setGrantPermission(true);
         runWebViewLayoutTest("blink-apis/eme/eme.html", "blink-apis/eme/eme-expected.txt");
         mTestActivity.setGrantPermission(false);
     }
 
-
     // test helper methods
 
     private void runWebViewLayoutTest(final String fileName, final String fileNameExpected)