Merge "Fix reading SurfaceFlinger dump in winscope" into rvc-dev am: d9dc576a2a

Change-Id: I41059452e2689114ea1c4f77986fa97163012555