Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dr1-dev am: 92d3bc1e1a  -s ours
am: c840cf40b9

Change-Id: Ida458300da7171d8fb65f89291544a93ff0684d5