Merge "[SurfaceFlinger] Add deferred txn trace points." into qt-dev
am: 5e492bfccc

Change-Id: Ie21ee312f4a9bb376fefba706fac709d5cba2ee9