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

[automerger skipped] Merge "Camera: document multiResolution raw behavior" into tm-dev am: b9aa94e3 am: a09cc401 am: 90e9e46c -s ours am: 0eb6f49d -s ours am: a30e5718 -s ours am: d5f835e9 -s ours

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

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



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