Merge "Keystore 2.0 SPI: Add EC_CURVE tag on key generation." into sc-dev am: 214d129500

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15225383

Change-Id: Ibedab6b2682c803e49a4ad9816dc4a9ca6cf8672