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

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



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