Merge "Merge "Keystore: Wire up Ed25519 signing" into tm-dev am: e41f27bf am: 922aaf55" into tm-d1-dev-plus-aosp am: 7271e013 am: d3b27549

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



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