am 2628bc9d: Merge "camera3: Don\'t crash when taking a still capture with ZSL disabled" into jb-mr2-dev

* commit '2628bc9d1261c2942f3506baca348ccd71ea9c86':
  camera3: Don't crash when taking a still capture with ZSL disabled