Merge "Keystore: Validate curve names in XDH and ED25519" into main am: fdf49c17 am: 9224c6bc

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



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