Merge commit '146a0fabb2db8d0677621d716ea02198c6a795ab' * commit '146a0fabb2db8d0677621d716ea02198c6a795ab': Unhide cancelAutoFocus API in Camera.
Merge commit '146a0fabb2db8d0677621d716ea02198c6a795ab' * commit '146a0fabb2db8d0677621d716ea02198c6a795ab': Unhide cancelAutoFocus API in Camera.