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 am: 8a24f6ff am: 62a9f66b

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



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