Merge changes from topic "provider_generics" into main

* changes:
  Convert NewProvider/NewMutatorProvider to generic providers API
  Use generics for providers API
  Fix TestAarImportProducesJniPackages/aar-no-jni

1 files changed, 2 insertions, 2 deletions

diff --git a/apex/classpath_element_test.go b/apex/classpath_element_test.go
index 9142eed99..1ce60ced9 100644
--- a/apex/classpath_element_test.go
+++ b/apex/classpath_element_test.go
@@ -33,11 +33,11 @@ type testClasspathElementContext struct {
 	errs        []error
 }
 
-func (t *testClasspathElementContext) OtherModuleHasProvider(module blueprint.Module, provider blueprint.ProviderKey) bool {
+func (t *testClasspathElementContext) OtherModuleHasProvider(module blueprint.Module, provider blueprint.AnyProviderKey) bool {
 	return t.testContext.ModuleHasProvider(module, provider)
 }
 
-func (t *testClasspathElementContext) OtherModuleProvider(module blueprint.Module, provider blueprint.ProviderKey) interface{} {
+func (t *testClasspathElementContext) OtherModuleProvider(module blueprint.Module, provider blueprint.AnyProviderKey) interface{} {
 	return t.testContext.ModuleProvider(module, provider)
 }