Merge "Skip curve25519 upgrade tests on KeyMint v1" am: 44671d923a am: bcb554a4f5

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

Change-Id: I700f50193f6bca7faf90069387f8259e1f34937f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>