Merge "Revert^2 "KeyMint HAL: add curve 25519, bump version"" am: 0834ba697f

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

Change-Id: I06062f5b39fe9a2e229aa732b2bd63cf067c05da