[automerger skipped] Merge "Keystore: Support Ed25519 keys" am: fa8aac4629 am: ad0c8bb23d -s ours
am skip reason: Merged-In I07b793cbd5029630768368ad4a863bbc1c828ced with SHA-1 143fa39384 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2092071
Change-Id: I586ef60d1cc5e9089de3229112a09adc07425b7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: