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

am skip reason: subject contains skip directive

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

Change-Id: I38d73d391235cf4adfa586e193ee3b67816e92c2