[automerger skipped] Expect x25519 data as SubjectPublicKeyInfo am: 415260e22f -s ours am: f67947f5c4 -s ours

am skip reason: Merged-In I0d515a7d3b7124288d36cbd219e3679fa5137f0c with SHA-1 034b3247da is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/18281062

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