Merge "Rewrite concurrency logic in SurfaceFlinger PowerAdvisor" into main