* changes: Make WifiActivityEnergyInfo @SystemApi Statsd: Clean up WifiActivityEnergyInfo BatteryStats: Clean up WifiActivityEnergyInfo