am 63d61640: am 55a1e78f: am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev

* commit '63d61640d41b85b32ca7287235ca638731555b63':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values