Merge "Add buffer usage for more consumers" am: 9a174e5c am: 97dc23ef am:...

Merge "Add buffer usage for more consumers" am: 9a174e5c am: 97dc23ef am: 119ecb0b am: 587e273d

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2640595



Change-Id: I139c172c864841cc998079350437d1302b62a86b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>