Merge "Move SyncStateContentProviderHelper to frameworks/ex"