am 3958caaf: am cb42f317: Merge "Camera3: Improve error logging" into jb-mr2-dev

* commit '3958caaf89da87f09b561da1f674bb0c1a9cf132':
  Camera3: Improve error logging