Merge "Camera2: Fix FPS value scaling between HAL2 and API" into jb-mr1-dev