[automerger skipped] Merge "Camera: fix stream ID for failed buffer request"...

[automerger skipped] Merge "Camera: fix stream ID for failed buffer request" into rvc-qpr-dev am: 127b0dba am: f096eca2 -s ours

am skip reason: Change-Id I70d3c3d8c77b7a4568d893bc19f4b3acecdd2684 with SHA-1 20126533 is in history

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

Change-Id: Idd5047aeacaeca02bd415467c960488989d29cc1