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