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

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

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



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