Merge "Remove references to BatteryStatsHelper from AppBatteryPreferenceController" into sc-dev