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

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

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



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