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

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

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