Merge "Keystore: Validate curve names in XDH and ED25519" into main am: fdf49c179e

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

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