Merge "Transition BatteryInfo and BatteryUtils to BatteryUsageStats API" into sc-dev