Merge "Merge "Merge "CameraITS: fix diff logic in test_yuv_jpeg_all.py" into nougat-cts-dev am: 2934cb1b91" into nougat-mr1-cts-dev am: b3200d6836" into oreo-cts-dev