Merge changes from topic "sf_maxAcquiredBufferCount" into sc-dev am: a9e4e2fb am: 5e8271c1 am: 0910791f

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

Change-Id: I106e4ad2e950a78c366e7f0f339871e8a663a674