am 052f9b2f: am 39bfc698: Merge "Add ability to test supported content types...
am 052f9b2f: am 39bfc698: Merge "Add ability to test supported content types to MediaDrm" into klp-dev
* commit '052f9b2f':
Add ability to test supported content types to MediaDrm