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