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