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

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

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



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