[automerger skipped] Merge "Fix pvmfw.img signing error" into...

[automerger skipped] Merge "Fix pvmfw.img signing error" into android15-tests-dev am: 8572ca54 -s ours am: ff510314 -s ours am: 514e269b -s ours

am skip reason: Merged-In I4a4129d221778906fb739a574d7adb48e91e9eda with SHA-1 a7d257cc is already in history

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



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