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

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



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