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

* commit '69508f494e46d9055cb424d480bb48d433ad3462':
  Camera2: Add hidden experimental tearDown method