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

Change-Id: Ia67b467eee2cea695914d8d021a172c0059961db