Merge "Revert "Fix concurrency and logic issues in BatteryUsageStats throttling logic"" into main