am 6e8a551f: Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev

* commit '6e8a551f9f7691e3d7ada46eeae5d2cc612d7938':
  Camera2: Add hidden experimental tearDown method