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

[automerger skipped] Merge "Camera: document multiResolution raw behavior" am: 63c4947d am: 5ec7d846 am: 38c5d795 -s ours

am skip reason: Merged-In I8cb569466c3f9abb17f70f2f254b22cd6314cb8a with SHA-1 cc914d2e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2452845



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