Merge "WifiManager: Remove unused param in getControllerActivityEnergyInfo"