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

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

Change-Id: I21eff3e3f3af55b2041b739dc7e0d8342df25599