[automerger skipped] Merge "RESTRICT AUTOMERGE: Camera: fix stream ID for...

[automerger skipped] Merge "RESTRICT AUTOMERGE: Camera: fix stream ID for failed buffer request" am: d64b467c am: cbca71fb -s ours am: 1cf0f39a am: dbdf6336 am: ef2f7cfe -s ours

am skip reason: subject contains skip directive

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

Change-Id: I85c85757c245f1f315e8ef30d274ba9ac4e1dcb4