[automerger skipped] Merge "RESTRICT AUTOMERGE: Camera: fix stream ID for failed buffer request" am: d64b467c29 am: cbca71fbcd -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id495cb41fd320cf78c2b0f3541a7ff648cd9680c