Merge "SF: fix FrameTimelineInfo association to buffers" into tm-qpr-dev am: 853d4759

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



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