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