Merge "Fix custom image OTA generation with extracted target files" into main...

Merge "Fix custom image OTA generation with extracted target files" into main am: aad75f8f am: 2edf1903

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



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