[automerger skipped] Merge "Keystore 2.0 SPI: Add EC_CURVE tag on key...

[automerger skipped] Merge "Keystore 2.0 SPI: Add EC_CURVE tag on key generation." am: f90282c1 am: 355a282b -s ours am: 42223578 -s ours am: be11550c -s ours

am skip reason: Merged-In I2e7dd4868abda85d244e73592ff12d688f5c21fc with SHA-1 5a3c8805 is already in history

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

Change-Id: I5d21d01c50df74511de7c738cb2380a7883c795c