Merge changes Ie9991707,If0b19429 into rvc-dev

* changes:
  Skip R-and-later test on Q
  MediaCodecTest: don't run R-specific tests on Q