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