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

Change-Id: Icd59715190f3aed006bcac0b7b5dc3e77ce49eae