Merge "Development: Remove unused param in getControllerActivityEnergyInfo"