Merge "Expand the usages of prebuilt_any in prebuilt_etc module gen" into main...

Merge "Expand the usages of prebuilt_any in prebuilt_etc module gen" into main am: cf16d8be am: e4c5a5ae

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



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