[automerger skipped] Merge "Fix override setBufferCount" am: 378fa1b4 am:...

[automerger skipped] Merge "Fix override setBufferCount" am: 378fa1b4 am: 736519b8 am: a097f754 am: 684dcb20 -s ours

am skip reason: Change-Id I0908228a6791d90544fbf4cb21170931bd31a9db with SHA-1 58f3306d is in history

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

Change-Id: I1fc666535e8012543149b4fda6e09946f54c3a63