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

Change-Id: I553b810afbafc7318e70ca73532862103994276e