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: Ief2937628c1aaaa207cc2163ab7d0496771012c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>