[automerger skipped] Merge "Add buffer usage for more consumers" into...

[automerger skipped] Merge "Add buffer usage for more consumers" into udc-mainline-prod am: 378e5f10 -s ours

am skip reason: Merged-In Iebc17309e04a84d08f137f38e561b83a58ecb642 with SHA-1 a438ca0a is already in history

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



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