Merge "Fix android.media.cts.ImageReaderDecoderTest fail on MT6580 project" am: 13916e1d17 am: d520872e9f am: 637df060d6

Change-Id: I33eea4c1f389f91439eb58f739b89dac76bfb847