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

* commit '39bfc6989259c5d24fd43f3d7fa7e967a4b17aac':
  Add ability to test supported content types to MediaDrm