Merge "browser: Move SyncStateContentProviderHelper to frameworks/ex"