[automerger skipped] Merge "Camera: Clarify configureStreams doc" am: 4ffb6e0bd8 am: 30ce543051
am: b41f01dd71  -s ours

Change-Id: Iabbeaa6c9a649836fe872336102815f95197ff66