am 6548f9b8: am 3209e18c: am 60261137: Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf" into mnc-dev
* commit '6548f9b8':
BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf