Merge "powerstats: Add EnergyConsumer API"