Merge "Revert "KeyMint HAL: add curve 25519, bump version"" am: 391a772300 am: f121b2c2bb am: 4df4387267

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1918632

Change-Id: I62794f74ce795658e6b5408c2e0a927b10e5f524