Merge "AMS.removeContentProviderExternal() should take a user-id"