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

Merge "Revert "Make glob output include product name"" into main am: ff3fcd1f am: 5d23bb7d am: 571db59b am: baf44279 am: f004f19f

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



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