Merge "Introduce dist-for-goals-with-filenametag" am: 07cfdab76a am: 1622541b05 am: f75b936fd1 am: 5283549e42

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

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