[Android] Force enable battery updates instead of resetting to clear power data.

adb over wifi is broken for power measurements. This should fix it.

BUG=497238

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

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

build/android/pylib/device/battery_utils.py

@@ -289,7 +289,9 @@ class BatteryUtils(object):
       raise device_errors.DeviceVersionError('Device must be L or higher.')
 
     self._device.RunShellCommand(
-        ['dumpsys', 'battery', 'reset'], check_return=True)
+        ['dumpsys', 'battery', 'set', 'usb', '1'], check_return=True)
+    self._device.RunShellCommand(
+        ['dumpsys', 'battery', 'set', 'ac', '1'], check_return=True)
     self._device.RunShellCommand(
         ['dumpsys', 'batterystats', '--reset'], check_return=True)
     battery_data = self._device.RunShellCommand(

build/android/pylib/device/battery_utils_test.py

@@ -104,13 +104,16 @@ 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(