Only disable individual tests in StartSurfaceLayoutTest

Run StartSurfaceLayoutTest on more bots to see if the deflaking efforts
work.

TBR=meiliang@chromium.org

Bug: 1023833
Change-Id: I554c82b0c02d90d6cf5770678e1eae47ee779ee6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1917959Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Commit-Queue: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715955}

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

@@ -84,8 +84,6 @@ import java.util.List;
         "force-fieldtrials=Study/Group"})
 @Restriction(
         {UiRestriction.RESTRICTION_TYPE_PHONE, Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE})
-@DisableIf.Build(sdk_is_less_than = Build.VERSION_CODES.M,
-        message = "https://crbug.com/1023833")
 public class StartSurfaceLayoutTest {
     // clang-format on
     private static final String BASE_PARAMS = "force-fieldtrial-params="
@@ -604,6 +602,8 @@ public class StartSurfaceLayoutTest {
     @Test
     @MediumTest
     @CommandLineFlags.Add({BASE_PARAMS})
+    @DisableIf.Build(sdk_is_less_than = Build.VERSION_CODES.M,
+            message = "https://crbug.com/1023833")
     public void testIncognitoToggle_tabCount() throws InterruptedException {
         mActivityTestRule.loadUrl(mUrl);
 
@@ -628,6 +628,8 @@ public class StartSurfaceLayoutTest {
     @Test
     @MediumTest
     @CommandLineFlags.Add({BASE_PARAMS})
+    @DisableIf.Build(sdk_is_less_than = Build.VERSION_CODES.M,
+            message = "https://crbug.com/1023833")
     public void testIncognitoToggle_thumbnailFetchCount() throws InterruptedException {
         mActivityTestRule.loadUrl(mUrl);
         int oldFetchCount = mTabListDelegate.getBitmapFetchCountForTesting();