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

Change-Id: I11b6c37310b1b82df3e090252c041429a874b52e