Merge "Use Soong-defined system image's artifacts in target_files.zip" into...

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

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



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