Merge "Revert "Add test for BatteryUsageStatsPerUid atom"" into main