[Telemetry] Make startup benchmark enable/disables match old master.cfg

BUG=388885
NOTRY=True

Review URL: https://codereview.chromium.org/575313003

Cr-Commit-Position: refs/heads/master@{#295795}

tools/perf/benchmarks/start_with_url.py

@@ -7,7 +7,7 @@ import page_sets
 from telemetry import benchmark
 
 
-@benchmark.Disabled('android', 'snowleopard') # crbug.com/336913
+@benchmark.Disabled
 class StartWithUrlCold(benchmark.Benchmark):
   """Measure time to start Chrome cold with startup URLs"""
   tag = 'cold'
@@ -17,7 +17,7 @@ class StartWithUrlCold(benchmark.Benchmark):
              'pageset_repeat': 5}
 
 
-@benchmark.Enabled('has tabs')
+@benchmark.Enabled('android', 'has tabs')
 class StartWithUrlWarm(benchmark.Benchmark):
   """Measure time to start Chrome warm with startup URLs"""
   tag = 'warm'

tools/perf/benchmarks/startup.py

@@ -26,7 +26,7 @@ class StartupWarmBlankPage(benchmark.Benchmark):
              'pageset_repeat': 20}
 
 
-@benchmark.Disabled('android', 'snowleopard') # crbug.com/336913
+@benchmark.Disabled  # crbug.com/336913
 class StartupColdTheme(benchmark.Benchmark):
   tag = 'theme_cold'
   test = startup.Startup
@@ -36,7 +36,7 @@ class StartupColdTheme(benchmark.Benchmark):
              'pageset_repeat': 5}
 
 
-@benchmark.Disabled('android')
+@benchmark.Disabled
 class StartupWarmTheme(benchmark.Benchmark):
   tag = 'theme_warm'
   test = startup.Startup
@@ -46,7 +46,7 @@ class StartupWarmTheme(benchmark.Benchmark):
              'pageset_repeat': 20}
 
 
-@benchmark.Disabled('android', 'snowleopard') # crbug.com/336913
+@benchmark.Disabled  # crbug.com/336913
 class StartupColdManyExtensions(benchmark.Benchmark):
   tag = 'many_extensions_cold'
   test = startup.Startup
@@ -56,7 +56,7 @@ class StartupColdManyExtensions(benchmark.Benchmark):
              'pageset_repeat': 5}
 
 
-@benchmark.Disabled('android')
+@benchmark.Disabled
 class StartupWarmManyExtensions(benchmark.Benchmark):
   tag = 'many_extensions_warm'
   test = startup.Startup