Merge "QCamera2: Fix CTS2 testJpegExif issue"