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

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

Change-Id: Iee82437971c7d2fb02b1900ab2df68869d636092