am 4c9aeb21: Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev

* commit '4c9aeb21051e908b0a0a0864a04a96a4109717a1':
  Camera2: Fix Parameters#setZoom off by 1 validation error