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

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

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



Change-Id: I9acefd1def06cefc153514c766489b341fa86b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Ignore-AOSP-First: to resolve merge conflict