Merge "Fix override setBufferCount" am: 378fa1b4c2

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

Change-Id: I94bb62e65da876c65efaf88bb19f55cf67c3a593