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

Change-Id: I09aad113aa4d3de5f9a2880fe93d1504cdf83b82