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

sync/internal_api/public/non_blocking_sync_common.h

Index: sync/internal_api/public/non_blocking_sync_common.h
diff --git a/sync/internal_api/public/non_blocking_sync_common.h b/sync/internal_api/public/non_blocking_sync_common.h
index 45ea7dcc0632c563afc2bb25494e008ddca3ef92..5424e46ae400fb80cdde06a3a494448c26c7bca6 100644
--- a/sync/internal_api/public/non_blocking_sync_common.h
+++ b/sync/internal_api/public/non_blocking_sync_common.h
@@ -31,16 +31,19 @@ struct SYNC_EXPORT CommitRequestData {
   // this struct.
   int64_t sequence_number = 0;
   int64_t base_version = 0;
+  std::string specifics_hash;
 };
 
 struct SYNC_EXPORT CommitResponseData {
   CommitResponseData();
+  CommitResponseData(const CommitResponseData& other);
   ~CommitResponseData();
 
   std::string id;
   std::string client_tag_hash;
   int64_t sequence_number = 0;
   int64_t response_version = 0;
+  std::string specifics_hash;
 };
 
 struct SYNC_EXPORT UpdateResponseData {