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

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

Change-Id: Ia91f7c63a2837ca37485aebfa3bfa8fab463d542