Merge "Align transaction trace timestamps with wm and sf trace" into rvc-dev am: 2dbf7c97a3

Change-Id: I6d5c5cdf9fbd003b81cd3a93f29834769cdd5238