Merge "SurfaceFlinger: fix PhaseOffsetsTest" into rvc-dev