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

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

Change-Id: Ib9fc34d05614192e4762b9e7934738e074728fca