Merge "SurfaceFlinger: use intended wake up time when calculating next present time" into rvc-dev am: caeea929f7 am: 7074743b61

Change-Id: I8e2419de273f1bb61f9df7464020eed664c2d484