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