Merge "Make the target_files zip reflect the recent partition change" into...

Merge "Make the target_files zip reflect the recent partition change" into main am: ad30396b am: 39b4166c am: 2e60b5f2

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



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