Merge "BatteryStats: Fix units on battery charge counter" into nyc-dev
am: 00194e0f24

* commit '00194e0f2468d3848aee7e65e542bb5224cfd44a':
  BatteryStats: Fix units on battery charge counter

Change-Id: Ic53adacbf82c210cb98dc58c4efe2deb3552c073