Merge "Camera: Handle RESULT_ERROR followed by BUFFER_ERROR" into oc-mr1-dev am: 1041ecbbcc
am: 8b9ac6c05a

Change-Id: I0014146aafa867f6b983fb8f6679442e85d945ed