[automerger skipped] SurfaceFlinger: Some fixes to DispSync
am: f8713e1884 -s ours
am skip reason: change_id I1f9544b064305c87f973120cc1bc59a0268b78e5 with SHA1 45e4e3634e is in history

Change-Id: I5e34f410ef5fa18f9d88cce4be9a79284f6a179f