Merge "Catch RejectedExecutionException in BatteryExternalStatsWorker" into main