[conflict] Merge "PrebuildEtcModule no longer implements OutputFiles method"...

[conflict] Merge "PrebuildEtcModule no longer implements OutputFiles method" into main am: 3125b75d am: 05ae2e9d

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



Change-Id: Ic054c0a0c4edbeb5b8afd395b975bd731724cc18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>