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

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

Change-Id: I0e9adceac974597b9da9aafc4c1f63c0d02ee381