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

* commit '02d3199dbe9d1d59e2ef288e5e170248e1d52bd4':
  Camera2: Add hidden experimental tearDown method