am 966fbc67: am 17b8cee9: Merge "Camera2 tests: Update for framework changes" into mnc-dev

* commit '966fbc673a60f0ecdcf9f535d01b549f7ef04b31':
  Camera2 tests: Update for framework changes