Merge "media: skip unsupported test clip in adaptive playback test" into marshmallow-cts-dev am: 6245c46aad
am: deeaccc636

* commit 'deeaccc63684223e9de3122aa52e7ff2aa6d6d9a':
  media: skip unsupported test clip in adaptive playback test