am e5c0550d: am 267240f2: Merge "BatteryStats: Clear power use when removing a UID from uid_cputime kernel module" into mnc-dev

* commit 'e5c0550dfe4089e10148a5208cd18a0eadbe8bbe':
  BatteryStats: Clear power use when removing a UID from uid_cputime kernel module

core/java/com/android/internal/os/KernelUidCpuTimeReader.java

@@ -151,6 +151,7 @@ public class KernelUidCpuTimeReader {
         if (index >= 0) {
             mLastUserTimeUs.removeAt(index);
             mLastSystemTimeUs.removeAt(index);
+            mLastPowerMaUs.removeAt(index);
         }
 
         try (FileWriter writer = new FileWriter(sRemoveUidProcFile)) {