am bc91d594: am a109cc1b: Merge "BatteryStats: Wifi energy data is sometimes wrong" into mnc-dev

* commit 'bc91d5946afcff999de5d5f72c673e6c95ebee67':
  BatteryStats: Wifi energy data is sometimes wrong