Merge "Add new KeyMint curve enum" am: f4a119d3e7 am: 088bd1323f

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1907872

Change-Id: Ic558c16fe9a56f3a797ab4d42e8183829cd8b0af