Merge changes from topic "colefaust_artifact_path_requirements" am: 7b51e8cb...

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

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



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