Merge "Camera: Fix docs for mandatory stream combinations" into udc-dev am: 91973000f3 am: 8af5c10730

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

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