Merge "Revert "Keystore: Validate curve names in XDH and ED25519"" into main am: 86657d6b

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



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