[Android] Reenable BattOr tests for android.

tools/perf/benchmarks/battor.py

 # Copyright 2016 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 core import perf_benchmark
 from telemetry.web_perf import timeline_based_measurement
 import page_sets
 from telemetry import benchmark
 
 
@@ skipping 69 matching lines @@
     if (possible_browser.browser_type == 'reference' and
         possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X'):
       return True
     return not possible_browser.platform.HasBattOrConnected()
 
   @classmethod
   def Name(cls):
     return 'battor.system_health_loading_mobile'
 
 
-@benchmark.Disabled('android')  # crbug.com/618330
 class BattOrPowerCases(_BattOrBenchmark):
   page_set = page_sets.power_cases.PowerCasesPageSet
 
   @classmethod
   def Name(cls):
     return 'battor.power_cases'
 
 
-@benchmark.Disabled('android') # crbug.com/618330
 class BattOrPowerCasesNoChromeTrace(_BattOrBenchmark):
   page_set = page_sets.power_cases.PowerCasesPageSet
 
   def CreateTimelineBasedMeasurementOptions(self):
     options = timeline_based_measurement.Options()
     options.config.enable_battor_trace = True
     options.config.enable_chrome_trace = False
     options.config.chrome_trace_config.SetDefaultOverheadFilter()
     options.SetTimelineBasedMetrics(['powerMetric', 'clockSyncLatencyMetric'])
     return options
 
   @classmethod
   def Name(cls):
     return 'battor.power_cases_no_chrome_trace'