Merge "Camera: Clarify configureStreams doc" am: 4ffb6e0bd8
am: 30ce543051

Change-Id: I9fc740e8aebd185d51cc296750aa4d598101a85a