Merge "Fix a race in AMS.getContentProviderImpl()."