Jonathan Majors' Ex-Girlfriend Drops Assault & Defamation Lawsuit Against Actor