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

[automerger skipped] Merge "Camera: document multiResolution raw behavior" am: ae41acbe am: 9a6f2a0f am: 31a6be68 -s ours am: 79ecdf41 -s ours am: c5cbe35d -s ours

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

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



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