Merge "Fix prebuilt boot image hermetic build" into main am: 5f4a51ef

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



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