[automerger skipped] RESTRICT AUTOMERGE: Camera: fix stream ID for failed buffer request am: ee2d1046 am: eb83a2b7 -s ours am: dca19c39 am: 0e3e6e39 am: 23b67f29 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I489aa70aa1ab30646c2bc1ac32f72c52f4ae7a61