Merge "Fix concurrency issues in BatteryUsageStatsProvider" into main