Merge "deprecate SyncConstValue, since it is now only used by the deprecated ContactsProvider interface"