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

Merge "Merge "Revert "GSI: build pvmfw"" into android15-tests-dev am: 069a5cd7" into main am: a903c2d2

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



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