Merge "Fix override setBufferCount" into rvc-qpr-dev am: 104baf809b

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

Change-Id: I65b1292e72312463ef435bd1db6f6524114a4cac