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 '6548f9b87652870de229eadfd1780bf7a406cb82':
  BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf