Merge "SurfaceFlinger: fix deferred transactions for buffers with timestamps" into qt-dev
am: d076fdd546

Change-Id: Id48158f005bfc6943d721e57d70d2824af3a43eb