d2/jf re-enable cancel_auto_focus

zsl cameras need this
https://github.com/CyanogenMod/android_packages_apps_Camera2/commit/110c926aca9918cdd2f30861be64a4497ef25b66

Change-Id: I47379f9c3327620ada1ce1e993179c8a5a04674a
Merge branch 'cm-11.0' into martincz