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

Change-Id: I66809cd8be5a07db42ba72cbedf283e7f76ecefd