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

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