[automerger skipped] Merge "Keystore: Wire up Ed25519 signing" am: c4c16766...

[automerger skipped] Merge "Keystore: Wire up Ed25519 signing" am: c4c16766 am: f130d0bb -s ours

am skip reason: Merged-In Icce4f7f2f8fa10081a9c6beff4813c2d91756469 with SHA-1 46faab53 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2096493



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