am ee40d832: Merge "Camera2: Use scene mode override parameter" into jb-mr1-dev

* commit 'ee40d832e55847182412b0f56da652af054d7c06':
  Camera2: Use scene mode override parameter