am 9b9b8a9e: am 08ebb6b1: Merge "Camera2: Fix SCENE_MODE" into jb-mr1-dev

* commit '9b9b8a9ece1c4e05f04f04b1fff63236fb3067f7':
  Camera2: Fix SCENE_MODE