Merge "batteryservice: Expose Charge Counters." into nyc-dev