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

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



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