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

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

Change-Id: I464cafbb909e1971bc6172129bf7f9225992ca99