[automerger skipped] Merge "Add prepend_artifact_with_product attribute for...

[automerger skipped] Merge "Add prepend_artifact_with_product attribute for dist" into main am: 156f3dc7 -s ours

am skip reason: Merged-In I96e690f23e801c22fe66f0f234be8a1f9a84062f with SHA-1 870dbdc9 is already in history

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



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