Merge "Make glob output include product name" into main am: 4d730a8f am:...

Merge "Make glob output include product name" into main am: 4d730a8f am: e64a844b am: c91f36ab am: 8303eb4a am: d46df6c6

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



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