Merge "Update charge level too when turning battery off." into pi-dev

am: 484b49c41b

Change-Id: If5564af2f8238b1f1927ca91fa583468c57c0246

tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java

@@ -831,6 +831,7 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
 
     protected void turnBatteryOff() throws Exception {
         executeSilentShellCommand("cmd battery set ac " + BATTERY_PLUGGED_ANY);
+        executeSilentShellCommand("cmd battery set level 100");
         executeSilentShellCommand("cmd battery set status "
                 + BatteryManager.BATTERY_STATUS_CHARGING);
         assertBatteryState(true);