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

* commit '46ea9b0b0451a44fc30a646a6e1c4062f0b3d62d':
  camera2: Workaround for null FACE_DETECT_MODE crashing