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

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



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