[automerger skipped] Merge "Camera: Clarify the FMQ read order for...
[automerger skipped] Merge "Camera: Clarify the FMQ read order for request/result" am: 94acf41d am: 33541788
am: 16c9bbef -s ours
am skip reason: change_id Ia34ac69ce670b1ebeda12d92af490c347f33c15b with SHA1 17a371de is in history
Change-Id: Ia51b52cf3d7f88e935ca14245fcc52a6203e7cd1