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

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



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