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

* commit 'c80938266fcdd14f2bb749d1a9dbb4af7dbde83f':
  camera2: Workaround for null FACE_DETECT_MODE crashing