Merge "Specify EcCurve when generating keys" am: a172a2309c am: 97a9abddd8 am: ebfaa65a1c am: f4142eb675

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

Change-Id: Iaeeb147806d28b7945dd56a5aacd347f6395310a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>