A kinder, gentler adbd restart

tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py

Index: tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
diff --git a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
index 33fd1fc31b012a20db14f2692a8c6bc5a5d2ae9b..c172ab6ed285e62ab3106856ce9fba2e087990f8 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
@@ -220,13 +220,12 @@ def FindAllAvailableBrowsers(finder_options, logging=real_logging):
         if ret:
           logging.warn('Failed to taskset %d (%s)', pid, ret)
 
-    if not os.environ.get('BUILDBOT_BUILDERNAME'):
-      # Killing adbd before running tests has proven to make them less likely to
-      # flake out during the test. We skip this if Telemetry is running under a
-      # buildbot because build/android/test_runner.py wrapper already took care
-      # of it before starting the shards.
-      adb.RestartAdbdOnDevice()
-      adb.WaitForDevicePm()
+  if not os.environ.get('BUILDBOT_BUILDERNAME'):
+    # Killing adbd before running tests has proven to make them less likely to
+    # flake out during the test. We skip this if Telemetry is running under a
+    # buildbot because build/android/test_runner.py wrapper already took care
+    # of it before starting the shards.
+    adb.RestartAdbdOnDevice()
 
   packages = adb.RunShellCommand('pm list packages')
   possible_browsers = []