BatteryService: Mod: Check against all conditions

* Change logical operators from `||` to ~&&` to achieve this.
* Additionally, change to using supplementalOrEmergencyModOnline()
  to avoid duplicating logic.

* This fixes battery power saver mode on some devices that were
  effected by the initial Battery mod commit.

Change-Id: I9b2bfa26ab0c204f7a42ba6010f1f569fa7b0fd8

Author: eyosen

services/core/java/com/android/server/BatteryService.java

@@ -387,8 +387,8 @@ private boolean isPoweredLocked(int plugTypeSet) {
         if ((plugTypeSet & BatteryManager.BATTERY_PLUGGED_WIRELESS) != 0 && mHealthInfo.chargerWirelessOnline) {
             return true;
         }
-        if ((plugTypeSet & BatteryManager.BATTERY_PLUGGED_MOD) != 0 ||
-            mPlugType == BatteryManager.BATTERY_PLUGGED_MOD || isModBatteryActive()) {
+        if ((plugTypeSet & BatteryManager.BATTERY_PLUGGED_MOD) != 0 &&
+                  supplementalOrEmergencyModOnline() && isModBatteryActive()) {
             return true;
         }
         return false;