[automerger skipped] Merge "SF: fix FrameTimelineInfo association to buffers"...

[automerger skipped] Merge "SF: fix FrameTimelineInfo association to buffers" into tm-qpr-dev am: 853d4759 am: d49f15fb -s ours

am skip reason: Merged-In I4206984be8e5a91c5dc15b74688575d97fbb5357 with SHA-1 d6e409e4 is already in history

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



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