Merge "[SurfaceFlinger] Resolve deadlock in SurfaceTracing." into rvc-dev am: 9fd126d0b5

Change-Id: If386b938d55bd8b2b2d79ee2a33988cb61886374