am 843aba43: am 2458d482: Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev

* commit '843aba43ef85f5a40db03e0f384ed096b03592d0':
  Camera2: Always disconnect in the client destructor