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

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



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