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

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