[automerger skipped] Merge "Camera: document multiResolution raw behavior"...

[automerger skipped] Merge "Camera: document multiResolution raw behavior" into tm-dev am: b9aa94e3 am: a506e858 -s ours am: 7c114687 -s ours am: 4d56ac24 -s ours

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

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



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