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

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

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