Merge "Transition HighUsageDetector to BatteryUsageStats API" into sc-dev