Merge "SurfaceFlinger: fix PhaseOffsetsTest" into rvc-dev am: d2655c03fe

Change-Id: Ie05ba81f4dad446c1f7754fba2372b7c74a35fef