[automerger skipped] Merge "Camera: document multiResolution raw behavior" am: ae41acbe90 am: 9a6f2a0f51 am: 31a6be686e -s ours

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

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

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