Merge "BatteryStats: Allow for sample errors in wlan stats" into nyc-dev
am: 135c4760fd

* commit '135c4760fddc7809ea5f7e9d58bc3f4b3a076875':
  BatteryStats: Allow for sample errors in wlan stats

Change-Id: I23e117ccaa78cb7e6a3a0b9df682ec459391fb34