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 am: d868a847 am: b6c52581 am: 628d0fcc

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



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