Merge changes from topic "wifiactivityenergyinfo"

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