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

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

Change-Id: If9c33f5574bfd7b02a035c83eac6359b9339a9c2