Merge "Allow appending artifact in dist with product name" am: dadc037e am:...

Merge "Allow appending artifact in dist with product name" am: dadc037e am: 2705a090 am: 04d34001 am: 5bbdd58c

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



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