Merge changes I41978037,I19e8a9e8 into main

* changes:
  Properly initialize android_system_image modules
  Add otherModuleProvider to ConfigurableEvaluatorContext

android/module.go

@@ -2211,6 +2211,7 @@ type ConfigContext interface {
 }
 
 type ConfigurableEvaluatorContext interface {
+	OtherModuleProviderContext
 	Config() Config
 	OtherModulePropertyErrorf(module Module, property string, fmt string, args ...interface{})
 	HasMutatorFinished(mutatorName string) bool