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

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

Change-Id: Ia1638d0c9af2bc3056d052f534afdbb6c34fbe82