[automerger skipped] Merge "Camera: document multiResolution raw behavior" into tm-dev am: b9aa94e390 am: a09cc401fe am: 90e9e46c16 -s ours am: 0eb6f49d80 -s ours

am skip reason: Merged-In I24269dd63c6f354a53c39de513a140907a0e41d2 with SHA-1 2ec8d2cac7 is already in history

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

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