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

* commit '3209e18ce09b3f7a441943cb7c9700744d058005':
  BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf