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

Change-Id: Ib93fa3a08eed94e6dd23019b6335d4bb1e7a6d78