Merge "[SurfaceFlinger] correct present time for negative phase offsets" into qt-r1-dev
am: a1501b9702

Change-Id: I91f7adcbbcebd5dd18b9bdae098c2470ede138b4