Ensure we delete media if we reject due to spam check#17246

erikjohnston merged 3 commits intodevelopelement-hq/synapse:developfrom

erikj/fix_media_spamelement-hq/synapse:erikj/fix_media_spamCopy head branch name to clipboard