am 7d3377ce: Merge "Camera2: update still capture template requirement"

* commit '7d3377ce5064b777408120ffa37e7a2b3b3a658c':
  Camera2: update still capture template requirement