[Telemetry] Make our Enabled/Disabled annotations match what the bots run.

tools/perf/benchmarks/start_with_url.py

Index: tools/perf/benchmarks/start_with_url.py
diff --git a/tools/perf/benchmarks/start_with_url.py b/tools/perf/benchmarks/start_with_url.py
index b4700e6cb7463a6f743f0439d607677c93ad3c05..c57e9dc946e4680b003f59769ed7f02c849b30af 100644
--- a/tools/perf/benchmarks/start_with_url.py
+++ b/tools/perf/benchmarks/start_with_url.py
@@ -1,13 +1,13 @@
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-from telemetry import benchmark
 
 from measurements import startup
 import page_sets
+from telemetry import benchmark
 
 
-@benchmark.Disabled('snowleopard') # crbug.com/336913
+@benchmark.Disabled('android', 'snowleopard') # crbug.com/336913
 class StartWithUrlCold(benchmark.Benchmark):
   """Measure time to start Chrome cold with startup URLs"""
   tag = 'cold'
@@ -16,6 +16,8 @@ class StartWithUrlCold(benchmark.Benchmark):
   options = {'cold': True,
              'pageset_repeat': 5}
 
+
+@benchmark.Enabled('has tabs')
 class StartWithUrlWarm(benchmark.Benchmark):
   """Measure time to start Chrome warm with startup URLs"""
   tag = 'warm'