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

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



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