Merge "CameraITS: fix diff logic in test_yuv_jpeg_all.py" into nougat-cts-dev