Merge "SurfaceFlinger: use intended wake up time when calculating next present time" into rvc-dev am: caeea929f7 am: 52b611c850 am: 21cda72734 am: c987a05e9d

Change-Id: I4f400d79cda087cb5ba7c10e03ff5b3cab947427