Disable content FrameSizeChange tests on Android KitKat. They're flaky.

https://crrev.com/592977 disabled these tests for browser_tests which
doesn't even run on Android... Instead they should have been disabled
in content_browsertests.

This also re-enables the tests elsewhere where they should already be
passing due to the browser_tests coverage.

BUG=778245
TEST=none
TBR=xhwang

Change-Id: Iabe79be96f8edb9d5aca3b2dd7e8ed3827c62999
Reviewed-on: https://chromium-review.googlesource.com/1238832Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593252}

content/browser/media/encrypted_media_browsertest.cc

@@ -307,13 +307,16 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest,
   TestConfigChange(ConfigChangeType::ENCRYPTED_TO_ENCRYPTED);
 }
 
-// https://crbug.com/788748 https://crbug.com/794080
-#if (defined(OS_ANDROID) || defined(OS_LINUX)) && defined(ADDRESS_SANITIZER)
-#define MAYBE_FrameSizeChangeVideo DISABLED_FrameSizeChangeVideo
-#else
-#define MAYBE_FrameSizeChangeVideo FrameSizeChangeVideo
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) {
+#if defined(OS_ANDROID)
+  // https://crbug.com/778245
+  if (base::android::BuildInfo::GetInstance()->sdk_int() <=
+      base::android::SDK_VERSION_KITKAT) {
+    DVLOG(0) << "Skipping test - FrameSizeChange is flaky on KitKat devices.";
+    return;
+  }
 #endif
-IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_FrameSizeChangeVideo) {
+
   TestFrameSizeChange();
 }