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

Change-Id: Ifbc1e8d9e807e390942240a98197a6722f5fe6f4