Merge "Output doze mode power in BatteryStats"