Merge commit '2697f855be4d8b0bccbb3ba5bf1ae1547d2cf595' * commit '2697f855be4d8b0bccbb3ba5bf1ae1547d2cf595': Fix deadlock in camera hal when auto focus failed
Merge commit '2697f855be4d8b0bccbb3ba5bf1ae1547d2cf595' * commit '2697f855be4d8b0bccbb3ba5bf1ae1547d2cf595': Fix deadlock in camera hal when auto focus failed