Update from https://crrev.com/327068

build/android/pylib/device/decorators.py

Index: build/android/pylib/device/decorators.py
diff --git a/build/android/pylib/device/decorators.py b/build/android/pylib/device/decorators.py
index 074a0fcac14131abe15fc3cdbf719c15849f7908..73c13da8b09b9c0c2ffe6053f6fac529801ed997 100644
--- a/build/android/pylib/device/decorators.py
+++ b/build/android/pylib/device/decorators.py
@@ -11,6 +11,7 @@ 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
@@ -56,13 +57,16 @@ def _TimeoutRetryWrapper(f, timeout_func, retries_func, pass_values=False):
         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