Update from https://crrev.com/327068

build/android/pylib/device/decorators.py

 # 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.
 
 """
 Function/method decorators that provide timeout and retry logic.
 """
 
 import functools
 import os
 import sys
 import threading
 
+from pylib import cmd_helper
 from pylib import constants
 from pylib.device import device_errors
 from pylib.utils import reraiser_thread
 from pylib.utils import timeout_retry
 
 # TODO(jbudorick) Remove once the DeviceUtils implementations are no longer
 #                 backed by AndroidCommands / android_testrunner.
 sys.path.append(os.path.join(constants.DIR_SOURCE_ROOT, 'third_party',
                              'android_testrunner'))
 import errors as old_errors
@@ skipping 25 matching lines @@
     def impl():
       return f(*args, **kwargs)
     try:
       if isinstance(threading.current_thread(),
                     timeout_retry.TimeoutRetryThread):
         return impl()
       else:
         return timeout_retry.Run(impl, timeout, retries)
     except old_errors.WaitForResponseTimedOutError as e:
       raise device_errors.CommandTimeoutError(str(e)), None, (
-             sys.exc_info()[2])
+          sys.exc_info()[2])
     except old_errors.DeviceUnresponsiveError as e:
       raise device_errors.DeviceUnreachableError(str(e)), None, (
-             sys.exc_info()[2])
+          sys.exc_info()[2])
     except reraiser_thread.TimeoutError as e:
       raise device_errors.CommandTimeoutError(str(e)), None, (
-             sys.exc_info()[2])
+          sys.exc_info()[2])
+    except cmd_helper.TimeoutError as e:
+      raise device_errors.CommandTimeoutError(str(e)), None, (
+          sys.exc_info()[2])
   return TimeoutRetryWrapper
 
 
 def WithTimeoutAndRetries(f):
   """A decorator that handles timeouts and retries.
 
   'timeout' and 'retries' kwargs must be passed to the function.
 
   Args:
     f: The function to decorate.
@@ skipping 68 matching lines @@
     The actual decorator.
   """
   def decorator(f):
     def get_timeout(inst, *_args, **kwargs):
       return kwargs.get('timeout', getattr(inst, default_timeout_name))
     def get_retries(inst, *_args, **kwargs):
       return kwargs.get('retries', getattr(inst, default_retries_name))
     return _TimeoutRetryWrapper(f, get_timeout, get_retries, pass_values=True)
   return decorator