Merge "power/stats: Add EnergyConsumer types"