Merge "Keystore: Support Curve 25519 in the SPI layer" am: 76cee808e2 am: 7b17653639

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

Change-Id: I7434def089facb812a5d4fc59889ac402354df27