Merge "Update MediaDrm exception handling" into jb-mr2-dev