Merge "powerstats: add new EnergyConsumerType for camera"