New trial for Baltimore officer in Freddie Gray death set for June