Merge "Change artifact matching to be more strict" into main am: eb086f0d

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



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