Merge "[sf] fix layer trace generation with new fe" into udc-dev am: dbf65411 am: 9a5ec538

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



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