Merge "[sf] fix buffer info when generating layers trace" into udc-dev am:...

Merge "[sf] fix buffer info when generating layers trace" into udc-dev am: 8581cb2a am: 183dbae2

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



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