Merge "power/stats: Add duration field to EnergyMeasurement"