Merge "Convert dumpsys batterystats --checkin and --proto to BatteryUsageStats API"