Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev