Merge "BatteryUsageStats atom - frameworks/base" into sc-dev