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

Change-Id: I10a20e7690329ea1b5ca84341dae970b6f4a87ff