Merge "libgui: align the Surface default mMaxBufferCount value with BufferQueue" into rvc-dev am: 4524ce5189 am: 7cf6872c4c

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

Change-Id: Ia8ebeb575d91b1719b6ad80f22d15d95f52e47aa