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

Change-Id: Iae0556a0b8ed69e952e7c402798b494b505a9eef