Merge changes from topic "sf_maxAcquiredBufferCount" into sc-dev am: a9e4e2fb am: 649daba0 am: 4c0b7f43

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

Change-Id: Iea066fcf673c1f3d42c4577c6cdaf59e3a3c3193