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

* commit '05ceb1ae272a7d9bd2898811eb7e1c1bb19d7491':

Change-Id: Iddedccc8199bfa9b850309b19716a0b534ea0c14