Merge "Camera: Fix up STREAM_CONFIGURATION_MAP doc" into tm-dev am: 945f5b8839

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

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