[automerger skipped] Merge "Camera: document multiResolution raw behavior" into tm-dev am: b9aa94e390 am: a506e85872 -s ours am: 7c11468777 -s ours

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

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

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