Merge "Only allow valid types to be used in DrmErrorEvent and DrmInfoEvent"