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

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



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