[automerger skipped] Merge "Fix out of bounds read and write in onQueueFilled in outQueue" into rvc-dev am: 42c95cf608 am: 7a7958f9c2 am: 9b524e9e05 am: d03ed980da am: d492b6eccc am: ce5f380768 am: 7f72dce841 am: ebc9ff6765 -s ours am: f971fe3f6b -s ours

am skip reason: Merged-In Ic230d10048193a785f185dc6a7de6f455f9318c1 with SHA-1 208e430bc6 is already in history

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

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