Merge "Revert "Adapt flicker tests to perfetto-based SurfaceFlinger tracing"" into main