Merge "fixup! Support generating partial OTAs from extracted target_files" into main am: 563a2f62

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



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