am bc4a5489: am a4516334: Merge "Camera: Add cancelAutofocus test case." into jb-dev

* commit 'bc4a5489a549aa6f21bbd68c8f45362f6729cb70':
  Camera: Add cancelAutofocus test case.