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

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



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