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

Change-Id: I5a7d40aa765688fc88ee2b80d723e31a91440fb9