Merge "BatteryStats: Don't assume every kernel reports a power field in /proc/uid_cputime" into mnc-dev