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

Change-Id: If244897dc2819c89c89dfac589862d1e95760ec3