Merge "media: consider default codec when testing playback" into oreo-mr1-cts-dev
am: d526f06abf

Change-Id: I2f89b1169f62af52cbfcb3ff8093474531508cfa