Amid mass protests, France announces return to universal military service