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

Change-Id: I997b42186a11154af1dfc934d608d1dc55f65fb3