Merge "Make the target_files zip reflect the recent partition change" into main am: ad30396b

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



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