[automerger skipped] RESTRICT AUTOMERGE: Camera: fix stream ID for failed buffer request am: ee2d104677 am: eb83a2b74e -s ours am: dca19c39d3

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

Change-Id: I1629dfe9cb5181306a47d6599a3f007cb8749f9b