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

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

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



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