[Sync] USS: Ignore encryption changes during conflict resolution 1/2

sync/api/conflict_resolution.h

Index: sync/api/conflict_resolution.h
diff --git a/sync/api/conflict_resolution.h b/sync/api/conflict_resolution.h
index e76e6de8446a70c455be1a69456fd47e33be914a..3a9bb32cd81d72b809571b5f21e568ebf7756d7f 100644
--- a/sync/api/conflict_resolution.h
+++ b/sync/api/conflict_resolution.h
@@ -24,6 +24,8 @@ class SYNC_EXPORT ConflictResolution {
     USE_LOCAL,
     USE_REMOTE,
     USE_NEW,
+    IGNORE_LOCAL_ENCRYPTION,   // Exists for logging purposes.
+    IGNORE_REMOTE_ENCRYPTION,  // Exists for logging purposes.
     TYPE_SIZE,
   };