Merge "Add diagnostic error code to MediaDrm IllegalStateExceptions"