Merge "Add additional error conditions to MediaDrm"