Adds --skip-clear-data flag to android's test_runner.py

build/android/pylib/local/device/local_device_instrumentation_test_run.py

 # Copyright 2015 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.
 
 import logging
 import re
 import time
 
 from devil.android import device_errors
 from pylib import flag_changer
@@ skipping 201 matching lines @@
         result_code, result_bundle, statuses, start_ms, duration_ms)
     if flags:
       for r in results:
         if r.GetName() == test_name:
           r.SetName(test_display_name)
     if DidPackageCrashOnDevice(self._test_instance.test_package, device):
       for r in results:
         if r.GetType() == base_test_result.ResultType.UNKNOWN:
           r.SetType(base_test_result.ResultType.CRASH)
     # TODO(jbudorick): ClearApplicationState on failure before switching
-    # instrumentation tests to platform mode.
+    # instrumentation tests to platform mode (but respect --skip-clear-data).
     return results
 
   #override
   def _ShouldShard(self):
     return True
 
   @classmethod
   def _GetTimeoutScaleFromAnnotations(cls, annotations):
     try:
       return int(annotations.get('TimeoutScale', 1))
     except ValueError as e:
       logging.warning("Non-integer value of TimeoutScale ignored. (%s)", str(e))
       return 1
 
   @classmethod
   def _GetTimeoutFromAnnotations(cls, annotations, test_name):
     for k, v in TIMEOUT_ANNOTATIONS:
       if k in annotations:
         timeout = v
         break
     else:
       logging.warning('Using default 1 minute timeout for %s', test_name)
       timeout = 60
 
     timeout *= cls._GetTimeoutScaleFromAnnotations(annotations)
 
     return timeout