Merge "Revert "[LayerTraceGenerator] fix mirrors and rel-z data"" into udc-dev...

Merge "Revert "[LayerTraceGenerator] fix mirrors and rel-z data"" into udc-dev am: e8357ae6 am: ba79dd04

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22102622



Change-Id: I191cddf80b425998403136105a0c0ce0c7e62379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>