[Android] Fix usb charging re-enabling on KK

The reset command takes upwards of 3 minutes on KK, this runs
the set usb 1 command so that it will set charging to on while it
is resetting.

BUG=

Review URL: https://codereview.chromium.org/1012383006

Cr-Commit-Position: refs/heads/master@{#321272}

build/android/pylib/device/device_utils.py

@@ -1554,6 +1554,8 @@ class DeviceUtils(object):
     def battery_updates_enabled():
       return self.GetCharging() is True
 
+    self.RunShellCommand(['dumpsys', 'battery', 'set', 'usb', '1'],
+                         check_return=True)
     self.RunShellCommand(['dumpsys', 'battery', 'reset'], check_return=True)
     timeout_retry.WaitFor(battery_updates_enabled, wait_period=1)
 

build/android/pylib/device/device_utils_test.py

@@ -1552,6 +1552,8 @@ class DeviceUtilsSetBatteryMeasurementTest(DeviceUtilsTest):
         (self.call.device.RunShellCommand(
             ['dumpsys', 'battery', 'set', 'usb', '0'], check_return=True), []),
         (self.call.device.GetCharging(), False),
+        (self.call.device.RunShellCommand(
+            ['dumpsys', 'battery', 'set', 'usb', '1'], check_return=True), []),
         (self.call.device.RunShellCommand(
             ['dumpsys', 'battery', 'reset'], check_return=True), []),
         (self.call.device.GetCharging(), True)):