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

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

Change-Id: I83be0e42947d2521e1395411e19797fe83800454