Merge "Remove references to BatterStatsHelper from BatteryUsageStatsProvider" into sc-dev