Merge "fixup! Support generating partial OTAs from extracted target_files"...

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

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



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