[sherrif] Disable testTabToGridFromLiveTab flaky test

StartSurfaceLayoutPerfTest#testTabToGridFromLiveTabWith10TabsWithoutThumbnail
is flaky on an Android O builder as well [1], disabling it for all
Android versions.

[1] https://ci.chromium.org/p/chrome/builders/ci/test-o-phone/5910

TBR=wychen@chromium.org

Bug: 1045938
Change-Id: I40e38d36623add441be0c7e13db7d0b3561165d4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2144088Reviewed-by: Alex Ilin <alexilin@chromium.org>
Commit-Queue: Alex Ilin <alexilin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759249}

chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceLayoutPerfTest.java

@@ -12,7 +12,6 @@ import static org.chromium.components.embedder_support.util.UrlConstants.NTP_URL
 import static org.chromium.content_public.browser.test.util.CriteriaHelper.DEFAULT_MAX_TIME_TO_POLL;
 import static org.chromium.content_public.browser.test.util.CriteriaHelper.DEFAULT_POLLING_INTERVAL;
 
-import android.os.Build;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.espresso.Espresso;
 import android.support.test.espresso.action.ViewActions;
@@ -29,9 +28,9 @@ import org.junit.runner.RunWith;
 
 import org.chromium.base.Log;
 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.EnormousTest;
+import org.chromium.base.test.util.FlakyTest;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.chrome.browser.compositor.animation.CompositorAnimator;
 import org.chromium.chrome.browser.compositor.layouts.Layout;
@@ -171,8 +170,7 @@ public class StartSurfaceLayoutPerfTest {
 
     @Test
     @EnormousTest
-    @DisableIf
-            .Build(sdk_is_less_than = Build.VERSION_CODES.N, message = "https://crbug.com/1045938")
+    @FlakyTest(message = "https://crbug.com/1045938")
     @CommandLineFlags.Add({BASE_PARAMS})
     public void testTabToGridFromLiveTabWith10TabsWithoutThumbnail() throws InterruptedException {
         // Note that most of the tabs won't have thumbnails.