Merge "RESTRICT AUTOMERGE: Camera: fix stream ID for failed buffer request" am: d64b467c29

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

Change-Id: I2accf52f23ab728d32212d1f786668040c81063a