Merge "Camera: Fix up STREAM_CONFIGURATION_MAP doc" into tm-dev am: 945f5b88 am: 1f534302

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



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