Merge "Merge "GSI: build pvmfw.img" into android15-tests-dev am: 343638f1"...

Merge "Merge "GSI: build pvmfw.img" into android15-tests-dev am: 343638f1" into main am: 97d74af5

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



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