Merge "BatteryStats: Record energy info stats from WiFi and Bluetooth controllers"