Merge "camera2: Fix docs for mandatory stream combinations." am: b13fbc15 am: 451ce2d7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2427686



Change-Id: Ide1b54ea630a4031c16133f1c08052ae01a90510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>