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

Change-Id: I1a52eb03c5496e344e09071a38769e17f9d21ce8