Merge changes from topic "colefaust_artifact_path_requirements" am: 7b51e8cb am: 41c46ae6

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



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