Merge "Avoid hidden ContentProviderOperation type"