Merge "Camera: Handle RESULT_ERROR followed by BUFFER_ERROR" into oc-mr1-dev