Update from https://crrev.com/333737

build/android/pylib/device/battery_utils_test.py

Index: build/android/pylib/device/battery_utils_test.py
diff --git a/build/android/pylib/device/battery_utils_test.py b/build/android/pylib/device/battery_utils_test.py
index 72799b8b5d109ea8fc3c3cdc89ffc66304b4bad0..51fae17d4fecc52febba8eeb8b19074229a3dccb 100755
--- a/build/android/pylib/device/battery_utils_test.py
+++ b/build/android/pylib/device/battery_utils_test.py
@@ -104,18 +104,21 @@ class BatteryUtilsSetChargingTest(BatteryUtilsTest):
 
 class BatteryUtilsSetBatteryMeasurementTest(BatteryUtilsTest):
 
+  @mock.patch('time.sleep', mock.Mock())
   def testBatteryMeasurement(self):
     with self.assertCalls(
         (self.call.device.RunShellCommand(
             mock.ANY, retries=0, single_line=True,
             timeout=10, check_return=True), '22'),
         (self.call.device.RunShellCommand(
-            ['dumpsys', 'battery', 'reset'], check_return=True), []),
+            ['dumpsys', 'battery', 'set', 'usb', '1'], check_return=True), []),
+        (self.call.device.RunShellCommand(
+            ['dumpsys', 'battery', 'set', 'ac', '1'], check_return=True), []),
         (self.call.device.RunShellCommand(
             ['dumpsys', 'batterystats', '--reset'], check_return=True), []),
         (self.call.device.RunShellCommand(
             ['dumpsys', 'batterystats', '--charged', '--checkin'],
-            check_return=True), []),
+            check_return=True, large_output=True), []),
         (self.call.device.RunShellCommand(
             ['dumpsys', 'battery', 'set', 'ac', '0'], check_return=True), []),
         (self.call.device.RunShellCommand(