Merge "Copy built images to generate target_files.zip" am: 54066e8d am: a69a5741

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



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