Merge "Fix batterystat Counter misreporting when charging" into oc-dev
am: 413b135244

Change-Id: I022ebf39e2dc8ac77466ffe23306f9f38914659d