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: I2abc01293f1b4cad71520793918e2a00c95b23cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>