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

build/android/pylib/instrumentation/test_runner.py

 # Copyright (c) 2012 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.
 
 """Class for running instrumentation tests on a single device."""
 
 import collections
 import logging
 import os
 import re
@@ skipping 211 matching lines @@
     if not results:
       return
     if results.DidRunPass():
       self.TearDownPerfMonitoring(test)
 
       if self.coverage_dir:
         self.device.PullFile(
             self.coverage_device_file, self.coverage_host_file)
         self.device.RunShellCommand(
             'rm -f %s' % self.coverage_device_file)
-    elif self.package_info:
+    elif self.package_info and not self.options.skip_clear_data:
       apk_under_test = self.test_pkg.GetApkUnderTest()
       permissions = apk_under_test.GetPermissions() if apk_under_test else None
       self.device.ClearApplicationState(
           self.package_info.package, permissions=permissions)
+      self.device.ClearApplicationState(self.package_info.package)
 
   def TearDownPerfMonitoring(self, test):
     """Cleans up performance monitoring if the specified test required it.
 
     Args:
       test: The name of the test that was just run.
     Raises:
       Exception: if there's anything wrong with the perf data.
     """
     if not self._IsPerfTest(test):
@@ skipping 168 matching lines @@
             result_name, ' '.join(flag_modifiers.add))
         if flag_modifiers.remove:
           result_name = '%s without {%s}' % (
             result_name, ' '.join(flag_modifiers.remove))
         result.SetName(result_name)
       results.AddResult(result)
 
       self.TestTeardown(test, results)
 
     return (results, None if results.DidRunPass() else test)