Merge "Prevent test crashes if device sets invalid curve" am: ceedbb0d1a am: cd2af34d63

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

Change-Id: I96e5bdd31b81b0284ccea45a7c6adbe67c5e6c0c