Merge "Use Soong-defined system image's artifacts in target_files.zip" into main am: 5d7cbb65

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



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