Merge "Allow uninstallable prebuilt_etc to be packaged" am: 525fdd57b5 am: c278ebe5b5

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1591732

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51ae00b895a2777e24dde49948445bfa6dbba19b

etc/prebuilt_etc.go

@@ -282,12 +282,15 @@ func (p *PrebuiltEtc) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 		Input:  p.sourceFilePath,
 	})
 
-	if p.Installable() {
+	if !p.Installable() {
+		p.SkipInstall()
+	}
+
+	// Call InstallFile even when uninstallable to make the module included in the package
 	installPath := ctx.InstallFile(p.installDirPath, p.outputFilePath.Base(), p.outputFilePath)
 	for _, sl := range p.properties.Symlinks {
 		ctx.InstallSymlink(p.installDirPath, sl, installPath)
 	}
-	}
 }
 
 func (p *PrebuiltEtc) AndroidMkEntries() []android.AndroidMkEntries {