French President Emmanuel Macron's administration has agreed to completely rewrite a draft plan that to curb freedom to film police officers on duty.