Merge "batteryService: Add Charge Counter." into nyc-dev
am: 0f36ba8

* commit '0f36ba81e7a8c05d6500ce32197989c6fc3c30fc':
  batteryService: Add Charge Counter.

Change-Id: Ia15b676d999118b774b5cdc7695083e1d694ee3f