[automerger skipped] Merge "Mitigate time outs from ImageDecoderTest" into android10-tests-dev am: 37751d2911 -s ours am: d7c5c08b14 -s ours

am skip reason: skipped by user jsusbilla

Original change: https://android-review.googlesource.com/c/platform/cts/+/1151310

Change-Id: I326ac4207425a6fc4227e93e80b20cf5fd28dcf0