Merge "SurfaceFlinger: calculate expected present once" into qt-r1-dev
am: b71fc34252

Change-Id: If8ca7a48a2414cc731e3185dce7173fe3028c01b