Merge "Specify KeyMint EC keys by curve not size" am: 153bbc9cc5 am: 0e3027ab80 am: b7633b628a

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

Change-Id: I2b85bd9989b0605df4df34db4caf55f379ba61ee