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

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



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