Merge "Make WakelockStatsFrameworkEvents test work with ravenwood" into main