Merge "Re-generate 4K boot OTAs using signed boot.img during signing process"...

Merge "Re-generate 4K boot OTAs using signed boot.img during signing process" into main am: 939326d3 am: f574cfe0

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



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