Merge "Copy built images to generate target_files.zip" am: 54066e8ddf am: a69a5741df am: 7ade48d463 am: 01b91475bb

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

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