am c8093826: am 46ea9b0b: Merge "camera2: Workaround for null FACE_DETECT_MODE...
am c8093826: am 46ea9b0b: Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev
* commit 'c8093826':
camera2: Workaround for null FACE_DETECT_MODE crashing