[automerger skipped] Merge "Increase frame history size when SF buffer queue...

[automerger skipped] Merge "Increase frame history size when SF buffer queue size changes" am: 1427779d am: 0bb30c48 -s ours am: 778a9024 -s ours

am skip reason: Merged-In Ida587a239a03f74ebb099d8634ff722a500fcdda with SHA-1 fe42efcc is already in history

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



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