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

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

Change-Id: I532ef50543a38fbed9d80c6779de8c22175cdf97