Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev