am db6ead4f: am 1bac8972: Merge "Camera2: Use ZSL format quirk." into jb-mr1-dev

* commit 'db6ead4fd0d8bbe3df6ede6727927830727cfa30':
  Camera2: Use ZSL format quirk.