am 9e83f44c: am 6ccc3c34: Merge "Camera2: Increase mode update timeout." into jb-mr1-dev

* commit '9e83f44c0b310a72a080c006ebc3c07bdccc7027':
  Camera2: Increase mode update timeout.