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

* commit 'f96a33865b03ed092f6e902b4bea5ec5db481cdc':
  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)) {