Revert "keystore2: cope with new curve25519 enum" am: 6c44cad429

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1918630

Change-Id: I78fc8306494a581f803c1e5fe168887bd4fb0427