Merge "Camera: Handle out-of-order frameNumber for ZSL requests" into qt-dev
am: 34bc57f738

Change-Id: I669013079b34c4701dd72e8f4bc3a408eb4fb9d1