Merge "MediaDrm API: Add two exceptions to handle error path scenarios" into jb-mr2-dev