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

Change-Id: I88ab7b82a9d4da8a101e14df4d7c8c4b20f4608b