Merge "Add ability to test supported content types to MediaDrm" into klp-dev