Merge "BatteryStats custom buckets: don't revive dead Uids" into sc-dev