Merge "Keystore: Support Ed25519 keys" into tm-dev am: 22c0a868 am:...

Merge "Keystore: Support Ed25519 keys" into tm-dev am: 22c0a868 am: 887ed311 am: c791ab6b am: 398acb64

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



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