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

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

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