Merge "Copy smearing method to BatteryStatsHelper" into oc-dr1-dev