Merge "Begin transition from BatteryStatsHelper to BatteryUsageStats API." into sc-dev