Merge "Relax the timeout in testMediaCodecActivity for slower devices." into android10-tests-dev