Merge "Camera: Avoid dequeue too many buffers from buffer queue" into...

Merge "Camera: Avoid dequeue too many buffers from buffer queue" into tm-qpr-dev am: cbbb6a56 am: a0e023c1

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



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