Merge "Revert "Expose ContentProviderOperation type""