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

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

Change-Id: I219352a252a5fa4e083916d7837663decb093c45