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

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



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