Merge "MediaDrm: revamp error codes & their javadocs" into sc-dev