Merge "Introduce BatteryUsageStats API"