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

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

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