Merge "Sign OTA packages inside target_files during signing" into main am:...

Merge "Sign OTA packages inside target_files during signing" into main am: ca96bcb0 am: f77ae7ec

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



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