[automerger skipped] Merge "RESTRICT AUTOMERGE: Camera: fix stream ID for failed buffer request" am: d64b467c am: cbca71fb -s ours am: 1cf0f39a am: dbdf6336

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

Change-Id: I2f63db18e47877b7b8ba37b39c051460980bfce8