[automerger skipped] Fix pvmfw.img signing error am: 609e2fa5 -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: I439be00799163f42b5c56cbe1fc8f3c9390b5002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>