Merge changes from topic "sf_maxAcquiredBufferCount" into sc-dev am: a9e4e2fb7a am: 19e047fb7c

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

Change-Id: Iae9b092dba5eedc8a83c6063e9d198bfa3804808