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

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



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