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

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

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



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