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

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



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