Merge "Keystore: Wire up Ed25519 signing" into tm-dev am: e41f27bf am: 3fdec0b7 am: 360cc621 am: 38cd1eac

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



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