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

Change-Id: Iaba5b47c6fda9d3dc6bc41b89c4899979eb4d89d