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

Merge "[automerger skipped] Increase frame history size when SF buffer queue size changes am: fe42efcc -s ours" into udc-dev am: ddfd0eff -s ours

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

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



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