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

Change-Id: I9a6ce1e179eac432663dc08438f51c5fe094a1ce