Merge "Merge "GSI: build pvmfw" into android15-tests-dev am: be3ce0f0" into...

Merge "Merge "GSI: build pvmfw" into android15-tests-dev am: be3ce0f0" into main am: dc4edb6d am: 48d96c50

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



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