Merge "Fix override setBufferCount" am: 378fa1b4c2 am: 736519b8c4 am: a097f75405

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

Change-Id: Id72bda47c23650d9eb9edc305181455e03f5bb09