Merge "Fix Lazy layers trace parsing in winscope" into tm-dev am: ac1d14473c

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/17237203

Change-Id: Iecbda6043808d687c2e6b3551854223e610e652c