Merge changes from topic "am-bdb3615428914123be143a4326b6e603" into main

* changes:
  [automerger skipped] Merge "Fix pvmfw.img signing error" into android15-tests-dev am: 8572ca54f3 -s ours
  [automerger skipped] Fix pvmfw.img signing error am: 609e2fa5f7 -s ours