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

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

Change-Id: I5f2a5fff4c8e31c916cb881f63783fd46d44c2d7