Merge "Add timeout to AMS.getContentProviderImpl()"