Merge "BatteryStats: Record doze wake locks" into mnc-dev