Merge "libgui: align the Surface default mMaxBufferCount value with BufferQueue" into rvc-dev am: 4524ce51 am: 440cf9ff

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

Change-Id: Ia03a41670485441e2a5b1ce10f6130fa049aae41