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

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



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