[automerger skipped] Merge "Fix (pvmfw.img) Embed correct public key for...

[automerger skipped] Merge "Fix (pvmfw.img) Embed correct public key for Microdroid verification" into android15-tests-dev am: f00f4d2b -s ours

am skip reason: Merged-In Ic8ae72898b8ab6067402b26eef9ed1b876a778f7 with SHA-1 04fca7f8 is already in history

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



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