Merge "Specify EcCurve when generating keys" am: a172a230 am: 97a9abdd

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



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