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

* commit '17b8cee9a2df698448381d1b03cec2b618c27e97':
  Camera2 tests: Update for framework changes