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

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



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