Merge "libgui: align the Surface default mMaxBufferCount value with BufferQueue" into rvc-dev am: 4524ce51 am: 7cf6872c am: 5e656dba am: 8525c2d5

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

Change-Id: I8cc0b5716bd3e27c46558c1c7604efede075c993