Merge "Merge "Camera: Update streamConfigurationMap doc for JPEG sizes" into...

Merge "Merge "Camera: Update streamConfigurationMap doc for JPEG sizes" into tm-dev am: 0558b513 am: 36b94109" into tm-d1-dev-plus-aosp am: 05f80dc0 am: 3700717d

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



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