Merge "Limit the number of UidBatteryConsumers included in the BatteryUsageStats atom" into sc-dev