am 76cf8fe7: Merge "Add ability to test supported content types to MediaDrm" into klp-dev

* commit '76cf8fe75e7c1abce9383fb915842f62228a1d91':
  Add ability to test supported content types to MediaDrm