Merge "Copy smearing method to BatteryStatsHelper" into oc-dr1-dev
am: 02ece2f486

Change-Id: I395712265d3d159c26c4f69f2a7abdfe31398aff